From 41e97e6d2bd817c39e0ce6593acea8b9b290ddd6 Mon Sep 17 00:00:00 2001
From: "Sebastien Rosset (serosset)" <serosset@cisco.com>
Date: Tue, 12 May 2020 18:57:25 -0700
Subject: [PATCH 01/11] Mustache template should use invokerPackage tag to
 generate import

---
 .../Java/libraries/jersey2/AbstractOpenApiSchema.mustache       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/AbstractOpenApiSchema.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/AbstractOpenApiSchema.mustache
index cdba3be84552..c924650e6c0a 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/AbstractOpenApiSchema.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/AbstractOpenApiSchema.mustache
@@ -2,7 +2,7 @@
 
 package {{invokerPackage}}.model;
 
-import org.openapitools.client.ApiException;
+import {{invokerPackage}}.ApiException;
 import java.lang.reflect.Type;
 import java.util.Map;
 import javax.ws.rs.core.GenericType;

From 77133c50b08c78b92bb7ddc517146a3573f7af33 Mon Sep 17 00:00:00 2001
From: "Sebastien Rosset (serosset)" <serosset@cisco.com>
Date: Thu, 21 May 2020 18:34:02 -0700
Subject: [PATCH 02/11] Add unit test showing how to construct objects from a
 JSON dict

---
 .../python-experimental/test/test_drawing.py  | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/samples/openapi3/client/petstore/python-experimental/test/test_drawing.py b/samples/openapi3/client/petstore/python-experimental/test/test_drawing.py
index 75089831d000..ab772bdbe6d2 100644
--- a/samples/openapi3/client/petstore/python-experimental/test/test_drawing.py
+++ b/samples/openapi3/client/petstore/python-experimental/test/test_drawing.py
@@ -26,6 +26,28 @@ def setUp(self):
     def tearDown(self):
         pass
 
+    def test_create_instances(self):
+        """
+        Validate instance can be created using pythonic name or OAS names.
+        """
+
+        # Validate object can be created using pythonic names.
+        inst = petstore_api.Shape(
+            shape_type="Triangle",
+            triangle_type="IsoscelesTriangle"
+        )
+        assert isinstance(inst, petstore_api.IsoscelesTriangle)
+
+        # Validate object can be created using OAS names.
+        # For example, this can be used to construct objects on the client
+        # when the input data is available as JSON documents.
+        data =  {
+              'shapeType': "Triangle",
+              'triangleType': "IsoscelesTriangle"
+        }
+        inst = petstore_api.Shape(**data, _from_server=True)
+        assert isinstance(inst, petstore_api.IsoscelesTriangle)
+
     def test_deserialize_oneof_reference(self):
         """
         Validate the scenario when the type of a OAS property is 'oneOf', and the 'oneOf'

From 721b8ff50d3f00e660fd1f943d8d37cf4710a772 Mon Sep 17 00:00:00 2001
From: "Sebastien Rosset (serosset)" <serosset@cisco.com>
Date: Thu, 21 May 2020 19:07:39 -0700
Subject: [PATCH 03/11] rename from_server to json_variable_naming

---
 .../method_init_composed.mustache             |  4 +-
 .../method_init_normal.mustache               |  2 +-
 .../method_init_shared.mustache               | 10 ++--
 .../method_set_attribute.mustache             |  2 +-
 .../python-experimental/model_utils.mustache  | 54 ++++++++++--------
 .../petstore_api/model_utils.py               | 56 +++++++++++--------
 .../models/additional_properties_any_type.py  | 12 ++--
 .../models/additional_properties_array.py     | 12 ++--
 .../models/additional_properties_boolean.py   | 12 ++--
 .../models/additional_properties_class.py     | 12 ++--
 .../models/additional_properties_integer.py   | 12 ++--
 .../models/additional_properties_number.py    | 12 ++--
 .../models/additional_properties_object.py    | 12 ++--
 .../models/additional_properties_string.py    | 12 ++--
 .../petstore_api/models/animal.py             | 12 ++--
 .../petstore_api/models/api_response.py       | 12 ++--
 .../models/array_of_array_of_number_only.py   | 12 ++--
 .../models/array_of_number_only.py            | 12 ++--
 .../petstore_api/models/array_test.py         | 12 ++--
 .../petstore_api/models/capitalization.py     | 12 ++--
 .../petstore_api/models/cat.py                | 14 +++--
 .../petstore_api/models/cat_all_of.py         | 12 ++--
 .../petstore_api/models/category.py           | 12 ++--
 .../petstore_api/models/child.py              | 14 +++--
 .../petstore_api/models/child_all_of.py       | 12 ++--
 .../petstore_api/models/child_cat.py          | 14 +++--
 .../petstore_api/models/child_cat_all_of.py   | 12 ++--
 .../petstore_api/models/child_dog.py          | 14 +++--
 .../petstore_api/models/child_dog_all_of.py   | 12 ++--
 .../petstore_api/models/child_lizard.py       | 14 +++--
 .../models/child_lizard_all_of.py             | 12 ++--
 .../petstore_api/models/class_model.py        | 12 ++--
 .../petstore_api/models/client.py             | 12 ++--
 .../petstore_api/models/dog.py                | 14 +++--
 .../petstore_api/models/dog_all_of.py         | 12 ++--
 .../petstore_api/models/enum_arrays.py        | 12 ++--
 .../petstore_api/models/enum_class.py         | 12 ++--
 .../petstore_api/models/enum_test.py          | 12 ++--
 .../petstore_api/models/file.py               | 12 ++--
 .../models/file_schema_test_class.py          | 12 ++--
 .../petstore_api/models/format_test.py        | 12 ++--
 .../petstore_api/models/grandparent.py        | 12 ++--
 .../petstore_api/models/grandparent_animal.py | 12 ++--
 .../petstore_api/models/has_only_read_only.py | 12 ++--
 .../petstore_api/models/list.py               | 12 ++--
 .../petstore_api/models/map_test.py           | 12 ++--
 ...perties_and_additional_properties_class.py | 12 ++--
 .../petstore_api/models/model200_response.py  | 12 ++--
 .../petstore_api/models/model_return.py       | 12 ++--
 .../petstore_api/models/name.py               | 12 ++--
 .../petstore_api/models/number_only.py        | 12 ++--
 .../petstore_api/models/order.py              | 12 ++--
 .../petstore_api/models/outer_composite.py    | 12 ++--
 .../petstore_api/models/outer_enum.py         | 12 ++--
 .../petstore_api/models/outer_number.py       | 12 ++--
 .../petstore_api/models/parent.py             | 14 +++--
 .../petstore_api/models/parent_all_of.py      | 12 ++--
 .../petstore_api/models/parent_pet.py         | 14 +++--
 .../petstore_api/models/pet.py                | 12 ++--
 .../petstore_api/models/player.py             | 12 ++--
 .../petstore_api/models/read_only_first.py    | 12 ++--
 .../petstore_api/models/special_model_name.py | 12 ++--
 .../petstore_api/models/string_boolean_map.py | 12 ++--
 .../petstore_api/models/tag.py                | 12 ++--
 .../models/type_holder_default.py             | 12 ++--
 .../models/type_holder_example.py             | 12 ++--
 .../petstore_api/models/user.py               | 12 ++--
 .../petstore_api/models/xml_item.py           | 12 ++--
 .../petstore_api/model_utils.py               | 56 +++++++++++--------
 .../models/additional_properties_class.py     | 12 ++--
 .../petstore_api/models/address.py            | 12 ++--
 .../petstore_api/models/animal.py             | 12 ++--
 .../petstore_api/models/api_response.py       | 12 ++--
 .../petstore_api/models/apple.py              | 12 ++--
 .../petstore_api/models/apple_req.py          | 12 ++--
 .../models/array_of_array_of_number_only.py   | 12 ++--
 .../models/array_of_number_only.py            | 12 ++--
 .../petstore_api/models/array_test.py         | 12 ++--
 .../petstore_api/models/banana.py             | 12 ++--
 .../petstore_api/models/banana_req.py         | 12 ++--
 .../petstore_api/models/biology_chordate.py   | 12 ++--
 .../petstore_api/models/biology_hominid.py    | 14 +++--
 .../petstore_api/models/biology_mammal.py     | 14 +++--
 .../petstore_api/models/biology_primate.py    | 14 +++--
 .../petstore_api/models/biology_reptile.py    | 14 +++--
 .../petstore_api/models/capitalization.py     | 12 ++--
 .../petstore_api/models/cat.py                | 14 +++--
 .../petstore_api/models/cat_all_of.py         | 12 ++--
 .../petstore_api/models/category.py           | 12 ++--
 .../petstore_api/models/class_model.py        | 12 ++--
 .../petstore_api/models/client.py             | 12 ++--
 .../models/complex_quadrilateral.py           | 14 +++--
 .../petstore_api/models/dog.py                | 14 +++--
 .../petstore_api/models/dog_all_of.py         | 12 ++--
 .../petstore_api/models/drawing.py            | 12 ++--
 .../petstore_api/models/enum_arrays.py        | 12 ++--
 .../petstore_api/models/enum_class.py         | 12 ++--
 .../petstore_api/models/enum_test.py          | 12 ++--
 .../models/equilateral_triangle.py            | 14 +++--
 .../petstore_api/models/file.py               | 12 ++--
 .../models/file_schema_test_class.py          | 12 ++--
 .../petstore_api/models/foo.py                | 12 ++--
 .../petstore_api/models/format_test.py        | 12 ++--
 .../petstore_api/models/fruit.py              | 14 +++--
 .../petstore_api/models/fruit_req.py          | 14 +++--
 .../petstore_api/models/gm_fruit.py           | 14 +++--
 .../petstore_api/models/has_only_read_only.py | 12 ++--
 .../models/health_check_result.py             | 12 ++--
 .../petstore_api/models/inline_object.py      | 12 ++--
 .../petstore_api/models/inline_object1.py     | 12 ++--
 .../petstore_api/models/inline_object2.py     | 12 ++--
 .../petstore_api/models/inline_object3.py     | 12 ++--
 .../petstore_api/models/inline_object4.py     | 12 ++--
 .../petstore_api/models/inline_object5.py     | 12 ++--
 .../models/inline_response_default.py         | 12 ++--
 .../petstore_api/models/isosceles_triangle.py | 14 +++--
 .../petstore_api/models/list.py               | 12 ++--
 .../petstore_api/models/mammal.py             | 14 +++--
 .../petstore_api/models/map_test.py           | 12 ++--
 ...perties_and_additional_properties_class.py | 12 ++--
 .../petstore_api/models/model200_response.py  | 12 ++--
 .../petstore_api/models/model_return.py       | 12 ++--
 .../petstore_api/models/name.py               | 12 ++--
 .../petstore_api/models/nullable_class.py     | 12 ++--
 .../petstore_api/models/nullable_shape.py     | 14 +++--
 .../petstore_api/models/number_only.py        | 12 ++--
 .../petstore_api/models/order.py              | 12 ++--
 .../petstore_api/models/outer_composite.py    | 12 ++--
 .../petstore_api/models/outer_enum.py         | 12 ++--
 .../models/outer_enum_default_value.py        | 12 ++--
 .../petstore_api/models/outer_enum_integer.py | 12 ++--
 .../outer_enum_integer_default_value.py       | 12 ++--
 .../petstore_api/models/pet.py                | 12 ++--
 .../petstore_api/models/quadrilateral.py      | 14 +++--
 .../models/quadrilateral_interface.py         | 12 ++--
 .../petstore_api/models/read_only_first.py    | 12 ++--
 .../petstore_api/models/scalene_triangle.py   | 14 +++--
 .../petstore_api/models/shape.py              | 14 +++--
 .../petstore_api/models/shape_interface.py    | 12 ++--
 .../petstore_api/models/shape_or_null.py      | 14 +++--
 .../models/simple_quadrilateral.py            | 14 +++--
 .../petstore_api/models/special_model_name.py | 12 ++--
 .../petstore_api/models/string_boolean_map.py | 12 ++--
 .../petstore_api/models/tag.py                | 12 ++--
 .../petstore_api/models/triangle.py           | 14 +++--
 .../petstore_api/models/triangle_interface.py | 12 ++--
 .../petstore_api/models/user.py               | 12 ++--
 .../petstore_api/models/whale.py              | 12 ++--
 .../petstore_api/models/zebra.py              | 12 ++--
 149 files changed, 1127 insertions(+), 817 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_init_composed.mustache b/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_init_composed.mustache
index a5d948f0dd8c..64328d5e97e7 100644
--- a/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_init_composed.mustache
+++ b/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_init_composed.mustache
@@ -1,7 +1,7 @@
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -15,7 +15,7 @@
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_from_server': _from_server,
+            '_json_variable_naming': _json_variable_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_init_normal.mustache b/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_init_normal.mustache
index 8433c49f2f6a..0994ebbbd801 100644
--- a/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_init_normal.mustache
+++ b/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_init_normal.mustache
@@ -1,7 +1,7 @@
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
diff --git a/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_init_shared.mustache b/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_init_shared.mustache
index 1631d57eec29..fee19ce5195c 100644
--- a/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_init_shared.mustache
+++ b/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_init_shared.mustache
@@ -1,5 +1,5 @@
     @convert_js_args_to_python_args
-    def __init__(self{{#requiredVars}}{{^defaultValue}}, {{name}}{{/defaultValue}}{{/requiredVars}}{{#requiredVars}}{{#defaultValue}}, {{name}}={{{defaultValue}}}{{/defaultValue}}{{/requiredVars}}, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self{{#requiredVars}}{{^defaultValue}}, {{name}}{{/defaultValue}}{{/requiredVars}}{{#requiredVars}}{{#defaultValue}}, {{name}}={{{defaultValue}}}{{/defaultValue}}{{/requiredVars}}, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """{{classname}} - a model defined in OpenAPI
 
 {{#requiredVars}}
@@ -26,8 +26,10 @@
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -54,7 +56,7 @@
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_set_attribute.mustache b/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_set_attribute.mustache
index fddbc7c2ea7d..aed889dbbb6b 100644
--- a/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_set_attribute.mustache
+++ b/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_set_attribute.mustache
@@ -33,7 +33,7 @@
 
         if self._check_type:
             value = validate_and_convert_types(
-                value, required_types_mixed, path_to_item, self._from_server,
+                value, required_types_mixed, path_to_item, self._json_variable_naming,
                 self._check_type, configuration=self._configuration)
         if (name,) in self.allowed_values:
             check_allowed_values(
diff --git a/modules/openapi-generator/src/main/resources/python/python-experimental/model_utils.mustache b/modules/openapi-generator/src/main/resources/python/python-experimental/model_utils.mustache
index 1c163a915a23..90948ee8bbbb 100644
--- a/modules/openapi-generator/src/main/resources/python/python-experimental/model_utils.mustache
+++ b/modules/openapi-generator/src/main/resources/python/python-experimental/model_utils.mustache
@@ -563,15 +563,17 @@ def order_response_types(required_types):
     return sorted_types
 
 
-def remove_uncoercible(required_types_classes, current_item, from_server,
+def remove_uncoercible(required_types_classes, current_item, json_variable_naming,
                        must_convert=True):
     """Only keeps the type conversions that are possible
 
     Args:
         required_types_classes (tuple): tuple of classes that are required
                           these should be ordered by COERCION_INDEX_BY_TYPE
-        from_server (bool): a boolean of whether the data is from the server
-                          if false, the data is from the client
+        json_variable_naming (bool): True if the variable names in the input
+            data are JSON names, i.e. as serialized.
+            False if the variables names in the input data are python
+            variable names in PEP-8 snake case.
         current_item (any): the current item (input data) to be converted
 
     Keyword Args:
@@ -601,7 +603,7 @@ def remove_uncoercible(required_types_classes, current_item, from_server,
             continue
 
         class_pair = (current_type_simple, required_type_class_simplified)
-        if must_convert and class_pair in COERCIBLE_TYPE_PAIRS[from_server]:
+        if must_convert and class_pair in COERCIBLE_TYPE_PAIRS[json_variable_naming]:
             results_classes.append(required_type_class)
         elif class_pair in UPCONVERSION_TYPE_PAIRS:
             results_classes.append(required_type_class)
@@ -785,7 +787,7 @@ def get_discriminator_class(model_class,
 
 
 def deserialize_model(model_data, model_class, path_to_item, check_type,
-                      configuration, from_server):
+                      configuration, json_variable_naming):
     """Deserializes model_data to model instance.
 
     Args:
@@ -795,8 +797,10 @@ def deserialize_model(model_data, model_class, path_to_item, check_type,
         check_type (bool): whether to check the data tupe for the values in
             the model
         configuration (Configuration): the instance to use to convert files
-        from_server (bool): True if the data is from the server
-            False if the data is from the client
+        json_variable_naming (bool): True if the variable names in the input
+            data are JSON names, i.e. as serialized.
+            False if the variables names in the input data are python
+            variable names in PEP-8 snake case.
 
     Returns:
         model instance
@@ -810,7 +814,7 @@ def deserialize_model(model_data, model_class, path_to_item, check_type,
     kw_args = dict(_check_type=check_type,
                    _path_to_item=path_to_item,
                    _configuration=configuration,
-                   _from_server=from_server)
+                   _json_variable_naming=json_variable_naming)
 
     if issubclass(model_class, ModelSimple):
         instance = model_class(value=model_data, **kw_args)
@@ -861,7 +865,7 @@ def deserialize_file(response_data, configuration, content_disposition=None):
 
 
 def attempt_convert_item(input_value, valid_classes, path_to_item,
-                         configuration, from_server, key_type=False,
+                         configuration, json_variable_naming, key_type=False,
                          must_convert=False, check_type=True):
     """
     Args:
@@ -869,8 +873,10 @@ def attempt_convert_item(input_value, valid_classes, path_to_item,
         valid_classes (any): the classes that are valid
         path_to_item (list): the path to the item to convert
         configuration (Configuration): the instance to use to convert files
-        from_server (bool): True if data is from the server, False is data is
-            from the client
+        json_variable_naming (bool): True if the variable names in the input
+            data are JSON names, i.e. as serialized.
+            False if the variables names in the input data are python
+            variable names in PEP-8 snake case.
         key_type (bool): if True we need to convert a key type (not supported)
         must_convert (bool): if True we must convert
         check_type (bool): if True we check the type or the returned data in
@@ -886,7 +892,7 @@ def attempt_convert_item(input_value, valid_classes, path_to_item,
     """
     valid_classes_ordered = order_response_types(valid_classes)
     valid_classes_coercible = remove_uncoercible(
-        valid_classes_ordered, input_value, from_server)
+        valid_classes_ordered, input_value, json_variable_naming)
     if not valid_classes_coercible or key_type:
         # we do not handle keytype errors, json will take care
         # of this for us
@@ -898,7 +904,7 @@ def attempt_convert_item(input_value, valid_classes, path_to_item,
             if issubclass(valid_class, OpenApiModel):
                 return deserialize_model(input_value, valid_class,
                                          path_to_item, check_type,
-                                         configuration, from_server)
+                                         configuration, json_variable_naming)
             elif valid_class == file_type:
                 return deserialize_file(input_value, configuration)
             return deserialize_primitive(input_value, valid_class,
@@ -970,7 +976,7 @@ def is_valid_type(input_class_simple, valid_classes):
 
 
 def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
-                               from_server, _check_type, configuration=None):
+                               json_variable_naming, _check_type, configuration=None):
     """Raises a TypeError is there is a problem, otherwise returns value
 
     Args:
@@ -981,8 +987,10 @@ def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
         path_to_item: (list) the path to the data being validated
             this stores a list of keys or indices to get to the data being
             validated
-        from_server (bool): True if data is from the server
-            False if data is from the client
+        json_variable_naming (bool): True if the variable names in the input
+            data are JSON names, i.e. as serialized.
+            False if the variables names in the input data are python
+            variable names in PEP-8 snake case.
         _check_type: (boolean) if true, type will be checked and conversion
             will be attempted.
         configuration: (Configuration): the configuration class to use
@@ -1010,7 +1018,7 @@ def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
                 valid_classes,
                 path_to_item,
                 configuration,
-                from_server,
+                json_variable_naming,
                 key_type=False,
                 must_convert=True
             )
@@ -1023,14 +1031,14 @@ def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
     if len(valid_classes) > 1 and configuration:
         # there are valid classes which are not the current class
         valid_classes_coercible = remove_uncoercible(
-            valid_classes, input_value, from_server, must_convert=False)
+            valid_classes, input_value, json_variable_naming, must_convert=False)
         if valid_classes_coercible:
             converted_instance = attempt_convert_item(
                 input_value,
                 valid_classes_coercible,
                 path_to_item,
                 configuration,
-                from_server,
+                json_variable_naming,
                 key_type=False,
                 must_convert=False
             )
@@ -1057,7 +1065,7 @@ def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
                 inner_value,
                 inner_required_types,
                 inner_path,
-                from_server,
+                json_variable_naming,
                 _check_type,
                 configuration=configuration
             )
@@ -1075,7 +1083,7 @@ def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
                 inner_val,
                 inner_required_types,
                 inner_path,
-                from_server,
+                json_variable_naming,
                 _check_type,
                 configuration=configuration
             )
@@ -1181,8 +1189,8 @@ def convert_js_args_to_python_args(fn):
     from functools import wraps
     @wraps(fn)
     def wrapped_init(self, *args, **kwargs):
-        from_server = kwargs.get('_from_server', False)
-        if from_server:
+        json_variable_naming = kwargs.get('_json_variable_naming', False)
+        if json_variable_naming:
             kwargs = change_keys_js_to_python(kwargs, self.__class__)
         return fn(self, *args, **kwargs)
     return wrapped_init
diff --git a/samples/client/petstore/python-experimental/petstore_api/model_utils.py b/samples/client/petstore/python-experimental/petstore_api/model_utils.py
index baf22c61d192..8e52e7535074 100644
--- a/samples/client/petstore/python-experimental/petstore_api/model_utils.py
+++ b/samples/client/petstore/python-experimental/petstore_api/model_utils.py
@@ -100,7 +100,7 @@ def set_attribute(self, name, value):
 
         if self._check_type:
             value = validate_and_convert_types(
-                value, required_types_mixed, path_to_item, self._from_server,
+                value, required_types_mixed, path_to_item, self._json_variable_naming,
                 self._check_type, configuration=self._configuration)
         if (name,) in self.allowed_values:
             check_allowed_values(
@@ -830,15 +830,17 @@ def index_getter(class_or_instance):
     return sorted_types
 
 
-def remove_uncoercible(required_types_classes, current_item, from_server,
+def remove_uncoercible(required_types_classes, current_item, json_variable_naming,
                        must_convert=True):
     """Only keeps the type conversions that are possible
 
     Args:
         required_types_classes (tuple): tuple of classes that are required
                           these should be ordered by COERCION_INDEX_BY_TYPE
-        from_server (bool): a boolean of whether the data is from the server
-                          if false, the data is from the client
+        json_variable_naming (bool): True if the variable names in the input
+            data are JSON names, i.e. as serialized.
+            False if the variables names in the input data are python
+            variable names in PEP-8 snake case.
         current_item (any): the current item (input data) to be converted
 
     Keyword Args:
@@ -868,7 +870,7 @@ def remove_uncoercible(required_types_classes, current_item, from_server,
             continue
 
         class_pair = (current_type_simple, required_type_class_simplified)
-        if must_convert and class_pair in COERCIBLE_TYPE_PAIRS[from_server]:
+        if must_convert and class_pair in COERCIBLE_TYPE_PAIRS[json_variable_naming]:
             results_classes.append(required_type_class)
         elif class_pair in UPCONVERSION_TYPE_PAIRS:
             results_classes.append(required_type_class)
@@ -1052,7 +1054,7 @@ def get_discriminator_class(model_class,
 
 
 def deserialize_model(model_data, model_class, path_to_item, check_type,
-                      configuration, from_server):
+                      configuration, json_variable_naming):
     """Deserializes model_data to model instance.
 
     Args:
@@ -1062,8 +1064,10 @@ def deserialize_model(model_data, model_class, path_to_item, check_type,
         check_type (bool): whether to check the data tupe for the values in
             the model
         configuration (Configuration): the instance to use to convert files
-        from_server (bool): True if the data is from the server
-            False if the data is from the client
+        json_variable_naming (bool): True if the variable names in the input
+            data are JSON names, i.e. as serialized.
+            False if the variables names in the input data are python
+            variable names in PEP-8 snake case.
 
     Returns:
         model instance
@@ -1077,7 +1081,7 @@ def deserialize_model(model_data, model_class, path_to_item, check_type,
     kw_args = dict(_check_type=check_type,
                    _path_to_item=path_to_item,
                    _configuration=configuration,
-                   _from_server=from_server)
+                   _json_variable_naming=json_variable_naming)
 
     if issubclass(model_class, ModelSimple):
         instance = model_class(value=model_data, **kw_args)
@@ -1128,7 +1132,7 @@ def deserialize_file(response_data, configuration, content_disposition=None):
 
 
 def attempt_convert_item(input_value, valid_classes, path_to_item,
-                         configuration, from_server, key_type=False,
+                         configuration, json_variable_naming, key_type=False,
                          must_convert=False, check_type=True):
     """
     Args:
@@ -1136,8 +1140,10 @@ def attempt_convert_item(input_value, valid_classes, path_to_item,
         valid_classes (any): the classes that are valid
         path_to_item (list): the path to the item to convert
         configuration (Configuration): the instance to use to convert files
-        from_server (bool): True if data is from the server, False is data is
-            from the client
+        json_variable_naming (bool): True if the variable names in the input
+            data are JSON names, i.e. as serialized.
+            False if the variables names in the input data are python
+            variable names in PEP-8 snake case.
         key_type (bool): if True we need to convert a key type (not supported)
         must_convert (bool): if True we must convert
         check_type (bool): if True we check the type or the returned data in
@@ -1153,7 +1159,7 @@ def attempt_convert_item(input_value, valid_classes, path_to_item,
     """
     valid_classes_ordered = order_response_types(valid_classes)
     valid_classes_coercible = remove_uncoercible(
-        valid_classes_ordered, input_value, from_server)
+        valid_classes_ordered, input_value, json_variable_naming)
     if not valid_classes_coercible or key_type:
         # we do not handle keytype errors, json will take care
         # of this for us
@@ -1165,7 +1171,7 @@ def attempt_convert_item(input_value, valid_classes, path_to_item,
             if issubclass(valid_class, OpenApiModel):
                 return deserialize_model(input_value, valid_class,
                                          path_to_item, check_type,
-                                         configuration, from_server)
+                                         configuration, json_variable_naming)
             elif valid_class == file_type:
                 return deserialize_file(input_value, configuration)
             return deserialize_primitive(input_value, valid_class,
@@ -1237,7 +1243,7 @@ def is_valid_type(input_class_simple, valid_classes):
 
 
 def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
-                               from_server, _check_type, configuration=None):
+                               json_variable_naming, _check_type, configuration=None):
     """Raises a TypeError is there is a problem, otherwise returns value
 
     Args:
@@ -1248,8 +1254,10 @@ def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
         path_to_item: (list) the path to the data being validated
             this stores a list of keys or indices to get to the data being
             validated
-        from_server (bool): True if data is from the server
-            False if data is from the client
+        json_variable_naming (bool): True if the variable names in the input
+            data are JSON names, i.e. as serialized.
+            False if the variables names in the input data are python
+            variable names in PEP-8 snake case.
         _check_type: (boolean) if true, type will be checked and conversion
             will be attempted.
         configuration: (Configuration): the configuration class to use
@@ -1277,7 +1285,7 @@ def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
                 valid_classes,
                 path_to_item,
                 configuration,
-                from_server,
+                json_variable_naming,
                 key_type=False,
                 must_convert=True
             )
@@ -1290,14 +1298,14 @@ def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
     if len(valid_classes) > 1 and configuration:
         # there are valid classes which are not the current class
         valid_classes_coercible = remove_uncoercible(
-            valid_classes, input_value, from_server, must_convert=False)
+            valid_classes, input_value, json_variable_naming, must_convert=False)
         if valid_classes_coercible:
             converted_instance = attempt_convert_item(
                 input_value,
                 valid_classes_coercible,
                 path_to_item,
                 configuration,
-                from_server,
+                json_variable_naming,
                 key_type=False,
                 must_convert=False
             )
@@ -1324,7 +1332,7 @@ def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
                 inner_value,
                 inner_required_types,
                 inner_path,
-                from_server,
+                json_variable_naming,
                 _check_type,
                 configuration=configuration
             )
@@ -1342,7 +1350,7 @@ def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
                 inner_val,
                 inner_required_types,
                 inner_path,
-                from_server,
+                json_variable_naming,
                 _check_type,
                 configuration=configuration
             )
@@ -1448,8 +1456,8 @@ def convert_js_args_to_python_args(fn):
     from functools import wraps
     @wraps(fn)
     def wrapped_init(self, *args, **kwargs):
-        from_server = kwargs.get('_from_server', False)
-        if from_server:
+        json_variable_naming = kwargs.get('_json_variable_naming', False)
+        if json_variable_naming:
             kwargs = change_keys_js_to_python(kwargs, self.__class__)
         return fn(self, *args, **kwargs)
     return wrapped_init
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_any_type.py b/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_any_type.py
index 4fec91d87358..52c18bfc2da6 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_any_type.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_any_type.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """additional_properties_any_type.AdditionalPropertiesAnyType - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_array.py b/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_array.py
index 345d5c970c9c..67f55c702fdc 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_array.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_array.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """additional_properties_array.AdditionalPropertiesArray - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_boolean.py b/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_boolean.py
index 22b604b631f7..131fd89d8a13 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_boolean.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_boolean.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """additional_properties_boolean.AdditionalPropertiesBoolean - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_class.py b/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_class.py
index 4ef564793dc0..28892a54b3cd 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_class.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_class.py
@@ -113,14 +113,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """additional_properties_class.AdditionalPropertiesClass - a model defined in OpenAPI
 
         Keyword Args:
@@ -131,8 +131,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -167,7 +169,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_integer.py b/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_integer.py
index c309826f2e82..0debd51b1eee 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_integer.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_integer.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """additional_properties_integer.AdditionalPropertiesInteger - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_number.py b/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_number.py
index 8bbd629023ea..d9e712e9aa5f 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_number.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_number.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """additional_properties_number.AdditionalPropertiesNumber - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_object.py b/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_object.py
index 749e3ada66e5..2c2b1faa967c 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_object.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_object.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """additional_properties_object.AdditionalPropertiesObject - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_string.py b/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_string.py
index 88fb6a5e15bc..c4aed6c7ac13 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_string.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_string.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """additional_properties_string.AdditionalPropertiesString - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/animal.py b/samples/client/petstore/python-experimental/petstore_api/models/animal.py
index dc87c6bf9e14..73a4f0a888c2 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/animal.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/animal.py
@@ -111,14 +111,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """animal.Animal - a model defined in OpenAPI
 
         Args:
@@ -132,8 +132,10 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -158,7 +160,7 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/api_response.py b/samples/client/petstore/python-experimental/petstore_api/models/api_response.py
index aa85a8d32c8e..db516ae58749 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/api_response.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/api_response.py
@@ -97,14 +97,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """api_response.ApiResponse - a model defined in OpenAPI
 
         Keyword Args:
@@ -115,8 +115,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -143,7 +145,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/array_of_array_of_number_only.py b/samples/client/petstore/python-experimental/petstore_api/models/array_of_array_of_number_only.py
index 8648ca8e101e..2c87c8aaec5f 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/array_of_array_of_number_only.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/array_of_array_of_number_only.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """array_of_array_of_number_only.ArrayOfArrayOfNumberOnly - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/array_of_number_only.py b/samples/client/petstore/python-experimental/petstore_api/models/array_of_number_only.py
index b457b27a8cb5..cebf5408970f 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/array_of_number_only.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/array_of_number_only.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """array_of_number_only.ArrayOfNumberOnly - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/array_test.py b/samples/client/petstore/python-experimental/petstore_api/models/array_test.py
index 3733298e843c..47163960895d 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/array_test.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/array_test.py
@@ -102,14 +102,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """array_test.ArrayTest - a model defined in OpenAPI
 
         Keyword Args:
@@ -120,8 +120,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -148,7 +150,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/capitalization.py b/samples/client/petstore/python-experimental/petstore_api/models/capitalization.py
index 3ca42fba60be..3086efab3e3b 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/capitalization.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/capitalization.py
@@ -103,14 +103,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """capitalization.Capitalization - a model defined in OpenAPI
 
         Keyword Args:
@@ -121,8 +121,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -152,7 +154,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/cat.py b/samples/client/petstore/python-experimental/petstore_api/models/cat.py
index bb0b08667d24..3e35195e8473 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/cat.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/cat.py
@@ -109,7 +109,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -119,7 +119,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """cat.Cat - a model defined in OpenAPI
 
         Args:
@@ -133,8 +133,10 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -160,7 +162,7 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -168,7 +170,7 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_from_server': _from_server,
+            '_json_variable_naming': _json_variable_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/cat_all_of.py b/samples/client/petstore/python-experimental/petstore_api/models/cat_all_of.py
index f008695b43ac..d7f02a59b6b8 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/cat_all_of.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/cat_all_of.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """cat_all_of.CatAllOf - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/category.py b/samples/client/petstore/python-experimental/petstore_api/models/category.py
index b34ba8ac0206..f39116c983c4 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/category.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/category.py
@@ -95,14 +95,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, name='default-name', _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, name='default-name', _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """category.Category - a model defined in OpenAPI
 
         Args:
@@ -116,8 +116,10 @@ def __init__(self, name='default-name', _check_type=True, _from_server=False, _p
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -142,7 +144,7 @@ def __init__(self, name='default-name', _check_type=True, _from_server=False, _p
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/child.py b/samples/client/petstore/python-experimental/petstore_api/models/child.py
index 3587e28fdcb7..1bbb35ebd150 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/child.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/child.py
@@ -105,7 +105,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -115,7 +115,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """child.Child - a model defined in OpenAPI
 
         Keyword Args:
@@ -126,8 +126,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -154,7 +156,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -162,7 +164,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_from_server': _from_server,
+            '_json_variable_naming': _json_variable_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/child_all_of.py b/samples/client/petstore/python-experimental/petstore_api/models/child_all_of.py
index c416862240f8..d8eca3a1fc41 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/child_all_of.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/child_all_of.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """child_all_of.ChildAllOf - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/child_cat.py b/samples/client/petstore/python-experimental/petstore_api/models/child_cat.py
index f382aa023ce4..1d0e521e34db 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/child_cat.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/child_cat.py
@@ -107,7 +107,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -117,7 +117,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, pet_type, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, pet_type, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """child_cat.ChildCat - a model defined in OpenAPI
 
         Args:
@@ -131,8 +131,10 @@ def __init__(self, pet_type, _check_type=True, _from_server=False, _path_to_item
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -157,7 +159,7 @@ def __init__(self, pet_type, _check_type=True, _from_server=False, _path_to_item
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -165,7 +167,7 @@ def __init__(self, pet_type, _check_type=True, _from_server=False, _path_to_item
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_from_server': _from_server,
+            '_json_variable_naming': _json_variable_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/child_cat_all_of.py b/samples/client/petstore/python-experimental/petstore_api/models/child_cat_all_of.py
index 2f0cf1bdc607..c59230a7d3de 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/child_cat_all_of.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/child_cat_all_of.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """child_cat_all_of.ChildCatAllOf - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/child_dog.py b/samples/client/petstore/python-experimental/petstore_api/models/child_dog.py
index c95da553350a..14303c504464 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/child_dog.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/child_dog.py
@@ -107,7 +107,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -117,7 +117,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, pet_type, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, pet_type, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """child_dog.ChildDog - a model defined in OpenAPI
 
         Args:
@@ -131,8 +131,10 @@ def __init__(self, pet_type, _check_type=True, _from_server=False, _path_to_item
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -157,7 +159,7 @@ def __init__(self, pet_type, _check_type=True, _from_server=False, _path_to_item
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -165,7 +167,7 @@ def __init__(self, pet_type, _check_type=True, _from_server=False, _path_to_item
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_from_server': _from_server,
+            '_json_variable_naming': _json_variable_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/child_dog_all_of.py b/samples/client/petstore/python-experimental/petstore_api/models/child_dog_all_of.py
index 1ab97028ee48..63c946d11caa 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/child_dog_all_of.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/child_dog_all_of.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """child_dog_all_of.ChildDogAllOf - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/child_lizard.py b/samples/client/petstore/python-experimental/petstore_api/models/child_lizard.py
index 04b98e500c43..ab448d1a408b 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/child_lizard.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/child_lizard.py
@@ -107,7 +107,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -117,7 +117,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, pet_type, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, pet_type, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """child_lizard.ChildLizard - a model defined in OpenAPI
 
         Args:
@@ -131,8 +131,10 @@ def __init__(self, pet_type, _check_type=True, _from_server=False, _path_to_item
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -157,7 +159,7 @@ def __init__(self, pet_type, _check_type=True, _from_server=False, _path_to_item
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -165,7 +167,7 @@ def __init__(self, pet_type, _check_type=True, _from_server=False, _path_to_item
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_from_server': _from_server,
+            '_json_variable_naming': _json_variable_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/child_lizard_all_of.py b/samples/client/petstore/python-experimental/petstore_api/models/child_lizard_all_of.py
index 41bd842225fd..7d9d18ddc8c3 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/child_lizard_all_of.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/child_lizard_all_of.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """child_lizard_all_of.ChildLizardAllOf - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/class_model.py b/samples/client/petstore/python-experimental/petstore_api/models/class_model.py
index a492a47164e7..5db2e1af5547 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/class_model.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/class_model.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """class_model.ClassModel - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/client.py b/samples/client/petstore/python-experimental/petstore_api/models/client.py
index 195e3d4209ca..bd5ce5ade76c 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/client.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/client.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """client.Client - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/dog.py b/samples/client/petstore/python-experimental/petstore_api/models/dog.py
index de8d27972b1a..3f55b0a81a40 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/dog.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/dog.py
@@ -109,7 +109,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -119,7 +119,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """dog.Dog - a model defined in OpenAPI
 
         Args:
@@ -133,8 +133,10 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -160,7 +162,7 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -168,7 +170,7 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_from_server': _from_server,
+            '_json_variable_naming': _json_variable_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/dog_all_of.py b/samples/client/petstore/python-experimental/petstore_api/models/dog_all_of.py
index 6278289267d5..33b5478fc206 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/dog_all_of.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/dog_all_of.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """dog_all_of.DogAllOf - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/enum_arrays.py b/samples/client/petstore/python-experimental/petstore_api/models/enum_arrays.py
index 107e1f3e0f8f..f2d46eb36037 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/enum_arrays.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/enum_arrays.py
@@ -103,14 +103,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """enum_arrays.EnumArrays - a model defined in OpenAPI
 
         Keyword Args:
@@ -121,8 +121,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -148,7 +150,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/enum_class.py b/samples/client/petstore/python-experimental/petstore_api/models/enum_class.py
index 4323ac7f0856..9185052ee078 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/enum_class.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/enum_class.py
@@ -90,14 +90,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, value='-efg', _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, value='-efg', _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """enum_class.EnumClass - a model defined in OpenAPI
 
         Args:
@@ -111,8 +111,10 @@ def __init__(self, value='-efg', _check_type=True, _from_server=False, _path_to_
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -136,7 +138,7 @@ def __init__(self, value='-efg', _check_type=True, _from_server=False, _path_to_
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/enum_test.py b/samples/client/petstore/python-experimental/petstore_api/models/enum_test.py
index 160db49fd14c..3dfe0732b296 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/enum_test.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/enum_test.py
@@ -124,14 +124,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, enum_string_required, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, enum_string_required, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """enum_test.EnumTest - a model defined in OpenAPI
 
         Args:
@@ -145,8 +145,10 @@ def __init__(self, enum_string_required, _check_type=True, _from_server=False, _
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -174,7 +176,7 @@ def __init__(self, enum_string_required, _check_type=True, _from_server=False, _
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/file.py b/samples/client/petstore/python-experimental/petstore_api/models/file.py
index 0f21a84df498..e250c79fda4e 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/file.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/file.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """file.File - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/file_schema_test_class.py b/samples/client/petstore/python-experimental/petstore_api/models/file_schema_test_class.py
index 2715cfdbfd55..874969d8a892 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/file_schema_test_class.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/file_schema_test_class.py
@@ -100,14 +100,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """file_schema_test_class.FileSchemaTestClass - a model defined in OpenAPI
 
         Keyword Args:
@@ -118,8 +118,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -145,7 +147,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/format_test.py b/samples/client/petstore/python-experimental/petstore_api/models/format_test.py
index b22bc0b30527..7192ffee4cc1 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/format_test.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/format_test.py
@@ -152,14 +152,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, number, byte, date, password, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, number, byte, date, password, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """format_test.FormatTest - a model defined in OpenAPI
 
         Args:
@@ -176,8 +176,10 @@ def __init__(self, number, byte, date, password, _check_type=True, _from_server=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -210,7 +212,7 @@ def __init__(self, number, byte, date, password, _check_type=True, _from_server=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/grandparent.py b/samples/client/petstore/python-experimental/petstore_api/models/grandparent.py
index bb5188acaf02..149de9dfc91c 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/grandparent.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/grandparent.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """grandparent.Grandparent - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/grandparent_animal.py b/samples/client/petstore/python-experimental/petstore_api/models/grandparent_animal.py
index f7157154f136..a60ae8ead74f 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/grandparent_animal.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/grandparent_animal.py
@@ -121,14 +121,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, pet_type, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, pet_type, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """grandparent_animal.GrandparentAnimal - a model defined in OpenAPI
 
         Args:
@@ -142,8 +142,10 @@ def __init__(self, pet_type, _check_type=True, _from_server=False, _path_to_item
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -167,7 +169,7 @@ def __init__(self, pet_type, _check_type=True, _from_server=False, _path_to_item
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/has_only_read_only.py b/samples/client/petstore/python-experimental/petstore_api/models/has_only_read_only.py
index 974136a56a6f..22623afe8169 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/has_only_read_only.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/has_only_read_only.py
@@ -95,14 +95,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """has_only_read_only.HasOnlyReadOnly - a model defined in OpenAPI
 
         Keyword Args:
@@ -113,8 +113,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -140,7 +142,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/list.py b/samples/client/petstore/python-experimental/petstore_api/models/list.py
index 3f85acb2e4d3..772d64c877bd 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/list.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/list.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """list.List - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/map_test.py b/samples/client/petstore/python-experimental/petstore_api/models/map_test.py
index e3510cef772f..487e2a3793f5 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/map_test.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/map_test.py
@@ -108,14 +108,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """map_test.MapTest - a model defined in OpenAPI
 
         Keyword Args:
@@ -126,8 +126,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -155,7 +157,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/mixed_properties_and_additional_properties_class.py b/samples/client/petstore/python-experimental/petstore_api/models/mixed_properties_and_additional_properties_class.py
index 36f5add3db88..42a9b15b86fb 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/mixed_properties_and_additional_properties_class.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/mixed_properties_and_additional_properties_class.py
@@ -102,14 +102,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """mixed_properties_and_additional_properties_class.MixedPropertiesAndAdditionalPropertiesClass - a model defined in OpenAPI
 
         Keyword Args:
@@ -120,8 +120,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -148,7 +150,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/model200_response.py b/samples/client/petstore/python-experimental/petstore_api/models/model200_response.py
index 96d39402d563..bc00b7694177 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/model200_response.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/model200_response.py
@@ -95,14 +95,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """model200_response.Model200Response - a model defined in OpenAPI
 
         Keyword Args:
@@ -113,8 +113,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -140,7 +142,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/model_return.py b/samples/client/petstore/python-experimental/petstore_api/models/model_return.py
index f9213c37ea7e..76f4315edc86 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/model_return.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/model_return.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """model_return.ModelReturn - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/name.py b/samples/client/petstore/python-experimental/petstore_api/models/name.py
index b2fce89ec9b7..fc7922375034 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/name.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/name.py
@@ -99,14 +99,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, name, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, name, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """name.Name - a model defined in OpenAPI
 
         Args:
@@ -120,8 +120,10 @@ def __init__(self, name, _check_type=True, _from_server=False, _path_to_item=(),
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -148,7 +150,7 @@ def __init__(self, name, _check_type=True, _from_server=False, _path_to_item=(),
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/number_only.py b/samples/client/petstore/python-experimental/petstore_api/models/number_only.py
index 896757360765..ca0e364039f4 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/number_only.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/number_only.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """number_only.NumberOnly - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/order.py b/samples/client/petstore/python-experimental/petstore_api/models/order.py
index 6ff62a572333..d43a0b84de2e 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/order.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/order.py
@@ -108,14 +108,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """order.Order - a model defined in OpenAPI
 
         Keyword Args:
@@ -126,8 +126,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -157,7 +159,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/outer_composite.py b/samples/client/petstore/python-experimental/petstore_api/models/outer_composite.py
index d34d654e0845..2b81526a0a3b 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/outer_composite.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/outer_composite.py
@@ -102,14 +102,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """outer_composite.OuterComposite - a model defined in OpenAPI
 
         Keyword Args:
@@ -120,8 +120,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -148,7 +150,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/outer_enum.py b/samples/client/petstore/python-experimental/petstore_api/models/outer_enum.py
index e85ac1b87ebb..1e761e87f8df 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/outer_enum.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/outer_enum.py
@@ -90,14 +90,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, value, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, value, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """outer_enum.OuterEnum - a model defined in OpenAPI
 
         Args:
@@ -111,8 +111,10 @@ def __init__(self, value, _check_type=True, _from_server=False, _path_to_item=()
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -136,7 +138,7 @@ def __init__(self, value, _check_type=True, _from_server=False, _path_to_item=()
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/outer_number.py b/samples/client/petstore/python-experimental/petstore_api/models/outer_number.py
index df65a2d3d047..4ed0a0b0b5ea 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/outer_number.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/outer_number.py
@@ -89,14 +89,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, value, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, value, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """outer_number.OuterNumber - a model defined in OpenAPI
 
         Args:
@@ -110,8 +110,10 @@ def __init__(self, value, _check_type=True, _from_server=False, _path_to_item=()
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -135,7 +137,7 @@ def __init__(self, value, _check_type=True, _from_server=False, _path_to_item=()
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/parent.py b/samples/client/petstore/python-experimental/petstore_api/models/parent.py
index 16bb62ed0fbd..8d3275851b7b 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/parent.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/parent.py
@@ -103,7 +103,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -113,7 +113,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """parent.Parent - a model defined in OpenAPI
 
         Keyword Args:
@@ -124,8 +124,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -151,7 +153,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -159,7 +161,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_from_server': _from_server,
+            '_json_variable_naming': _json_variable_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/parent_all_of.py b/samples/client/petstore/python-experimental/petstore_api/models/parent_all_of.py
index 6ee6983a4abc..d8b2e17e02f2 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/parent_all_of.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/parent_all_of.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """parent_all_of.ParentAllOf - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/parent_pet.py b/samples/client/petstore/python-experimental/petstore_api/models/parent_pet.py
index 5012af9ae1b0..0bed372a7464 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/parent_pet.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/parent_pet.py
@@ -118,7 +118,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -128,7 +128,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, pet_type, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, pet_type, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """parent_pet.ParentPet - a model defined in OpenAPI
 
         Args:
@@ -142,8 +142,10 @@ def __init__(self, pet_type, _check_type=True, _from_server=False, _path_to_item
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -167,7 +169,7 @@ def __init__(self, pet_type, _check_type=True, _from_server=False, _path_to_item
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -175,7 +177,7 @@ def __init__(self, pet_type, _check_type=True, _from_server=False, _path_to_item
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_from_server': _from_server,
+            '_json_variable_naming': _json_variable_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/pet.py b/samples/client/petstore/python-experimental/petstore_api/models/pet.py
index 1b34db901312..6f442d55ba60 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/pet.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/pet.py
@@ -118,14 +118,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, name, photo_urls, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, name, photo_urls, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """pet.Pet - a model defined in OpenAPI
 
         Args:
@@ -140,8 +140,10 @@ def __init__(self, name, photo_urls, _check_type=True, _from_server=False, _path
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -169,7 +171,7 @@ def __init__(self, name, photo_urls, _check_type=True, _from_server=False, _path
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/player.py b/samples/client/petstore/python-experimental/petstore_api/models/player.py
index 147bf2ff6f97..4b181f33309a 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/player.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/player.py
@@ -95,14 +95,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, name, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, name, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """player.Player - a model defined in OpenAPI
 
         Args:
@@ -116,8 +116,10 @@ def __init__(self, name, _check_type=True, _from_server=False, _path_to_item=(),
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -142,7 +144,7 @@ def __init__(self, name, _check_type=True, _from_server=False, _path_to_item=(),
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/read_only_first.py b/samples/client/petstore/python-experimental/petstore_api/models/read_only_first.py
index 8c6d80c71f16..5968c992a38c 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/read_only_first.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/read_only_first.py
@@ -95,14 +95,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """read_only_first.ReadOnlyFirst - a model defined in OpenAPI
 
         Keyword Args:
@@ -113,8 +113,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -140,7 +142,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/special_model_name.py b/samples/client/petstore/python-experimental/petstore_api/models/special_model_name.py
index 168554fa343e..42e4dd0dfe39 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/special_model_name.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/special_model_name.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """special_model_name.SpecialModelName - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/string_boolean_map.py b/samples/client/petstore/python-experimental/petstore_api/models/string_boolean_map.py
index 10d0a9882261..3c117269fd32 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/string_boolean_map.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/string_boolean_map.py
@@ -91,14 +91,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """string_boolean_map.StringBooleanMap - a model defined in OpenAPI
 
         Keyword Args:
@@ -109,8 +109,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -134,7 +136,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/tag.py b/samples/client/petstore/python-experimental/petstore_api/models/tag.py
index fdd4ff690009..6e433fe52c06 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/tag.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/tag.py
@@ -97,14 +97,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """tag.Tag - a model defined in OpenAPI
 
         Keyword Args:
@@ -115,8 +115,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -143,7 +145,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/type_holder_default.py b/samples/client/petstore/python-experimental/petstore_api/models/type_holder_default.py
index 442f9837881b..1114be589815 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/type_holder_default.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/type_holder_default.py
@@ -105,14 +105,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, array_item, string_item='what', number_item=1.234, integer_item=-2, bool_item=True, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, array_item, string_item='what', number_item=1.234, integer_item=-2, bool_item=True, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """type_holder_default.TypeHolderDefault - a model defined in OpenAPI
 
         Args:
@@ -130,8 +130,10 @@ def __init__(self, array_item, string_item='what', number_item=1.234, integer_it
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -157,7 +159,7 @@ def __init__(self, array_item, string_item='what', number_item=1.234, integer_it
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/type_holder_example.py b/samples/client/petstore/python-experimental/petstore_api/models/type_holder_example.py
index 0c08758bf04a..8584b6f85a5c 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/type_holder_example.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/type_holder_example.py
@@ -110,14 +110,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, bool_item, array_item, string_item='what', number_item=1.234, integer_item=-2, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, bool_item, array_item, string_item='what', number_item=1.234, integer_item=-2, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """type_holder_example.TypeHolderExample - a model defined in OpenAPI
 
         Args:
@@ -135,8 +135,10 @@ def __init__(self, bool_item, array_item, string_item='what', number_item=1.234,
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -160,7 +162,7 @@ def __init__(self, bool_item, array_item, string_item='what', number_item=1.234,
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/user.py b/samples/client/petstore/python-experimental/petstore_api/models/user.py
index 1f1095d3773c..27db6056303d 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/user.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/user.py
@@ -107,14 +107,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """user.User - a model defined in OpenAPI
 
         Keyword Args:
@@ -125,8 +125,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -158,7 +160,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/xml_item.py b/samples/client/petstore/python-experimental/petstore_api/models/xml_item.py
index aad4db483aa4..05ca9b3cc5f8 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/xml_item.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/xml_item.py
@@ -149,14 +149,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """xml_item.XmlItem - a model defined in OpenAPI
 
         Keyword Args:
@@ -167,8 +167,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -221,7 +223,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model_utils.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model_utils.py
index baf22c61d192..8e52e7535074 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model_utils.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model_utils.py
@@ -100,7 +100,7 @@ def set_attribute(self, name, value):
 
         if self._check_type:
             value = validate_and_convert_types(
-                value, required_types_mixed, path_to_item, self._from_server,
+                value, required_types_mixed, path_to_item, self._json_variable_naming,
                 self._check_type, configuration=self._configuration)
         if (name,) in self.allowed_values:
             check_allowed_values(
@@ -830,15 +830,17 @@ def index_getter(class_or_instance):
     return sorted_types
 
 
-def remove_uncoercible(required_types_classes, current_item, from_server,
+def remove_uncoercible(required_types_classes, current_item, json_variable_naming,
                        must_convert=True):
     """Only keeps the type conversions that are possible
 
     Args:
         required_types_classes (tuple): tuple of classes that are required
                           these should be ordered by COERCION_INDEX_BY_TYPE
-        from_server (bool): a boolean of whether the data is from the server
-                          if false, the data is from the client
+        json_variable_naming (bool): True if the variable names in the input
+            data are JSON names, i.e. as serialized.
+            False if the variables names in the input data are python
+            variable names in PEP-8 snake case.
         current_item (any): the current item (input data) to be converted
 
     Keyword Args:
@@ -868,7 +870,7 @@ def remove_uncoercible(required_types_classes, current_item, from_server,
             continue
 
         class_pair = (current_type_simple, required_type_class_simplified)
-        if must_convert and class_pair in COERCIBLE_TYPE_PAIRS[from_server]:
+        if must_convert and class_pair in COERCIBLE_TYPE_PAIRS[json_variable_naming]:
             results_classes.append(required_type_class)
         elif class_pair in UPCONVERSION_TYPE_PAIRS:
             results_classes.append(required_type_class)
@@ -1052,7 +1054,7 @@ def get_discriminator_class(model_class,
 
 
 def deserialize_model(model_data, model_class, path_to_item, check_type,
-                      configuration, from_server):
+                      configuration, json_variable_naming):
     """Deserializes model_data to model instance.
 
     Args:
@@ -1062,8 +1064,10 @@ def deserialize_model(model_data, model_class, path_to_item, check_type,
         check_type (bool): whether to check the data tupe for the values in
             the model
         configuration (Configuration): the instance to use to convert files
-        from_server (bool): True if the data is from the server
-            False if the data is from the client
+        json_variable_naming (bool): True if the variable names in the input
+            data are JSON names, i.e. as serialized.
+            False if the variables names in the input data are python
+            variable names in PEP-8 snake case.
 
     Returns:
         model instance
@@ -1077,7 +1081,7 @@ def deserialize_model(model_data, model_class, path_to_item, check_type,
     kw_args = dict(_check_type=check_type,
                    _path_to_item=path_to_item,
                    _configuration=configuration,
-                   _from_server=from_server)
+                   _json_variable_naming=json_variable_naming)
 
     if issubclass(model_class, ModelSimple):
         instance = model_class(value=model_data, **kw_args)
@@ -1128,7 +1132,7 @@ def deserialize_file(response_data, configuration, content_disposition=None):
 
 
 def attempt_convert_item(input_value, valid_classes, path_to_item,
-                         configuration, from_server, key_type=False,
+                         configuration, json_variable_naming, key_type=False,
                          must_convert=False, check_type=True):
     """
     Args:
@@ -1136,8 +1140,10 @@ def attempt_convert_item(input_value, valid_classes, path_to_item,
         valid_classes (any): the classes that are valid
         path_to_item (list): the path to the item to convert
         configuration (Configuration): the instance to use to convert files
-        from_server (bool): True if data is from the server, False is data is
-            from the client
+        json_variable_naming (bool): True if the variable names in the input
+            data are JSON names, i.e. as serialized.
+            False if the variables names in the input data are python
+            variable names in PEP-8 snake case.
         key_type (bool): if True we need to convert a key type (not supported)
         must_convert (bool): if True we must convert
         check_type (bool): if True we check the type or the returned data in
@@ -1153,7 +1159,7 @@ def attempt_convert_item(input_value, valid_classes, path_to_item,
     """
     valid_classes_ordered = order_response_types(valid_classes)
     valid_classes_coercible = remove_uncoercible(
-        valid_classes_ordered, input_value, from_server)
+        valid_classes_ordered, input_value, json_variable_naming)
     if not valid_classes_coercible or key_type:
         # we do not handle keytype errors, json will take care
         # of this for us
@@ -1165,7 +1171,7 @@ def attempt_convert_item(input_value, valid_classes, path_to_item,
             if issubclass(valid_class, OpenApiModel):
                 return deserialize_model(input_value, valid_class,
                                          path_to_item, check_type,
-                                         configuration, from_server)
+                                         configuration, json_variable_naming)
             elif valid_class == file_type:
                 return deserialize_file(input_value, configuration)
             return deserialize_primitive(input_value, valid_class,
@@ -1237,7 +1243,7 @@ def is_valid_type(input_class_simple, valid_classes):
 
 
 def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
-                               from_server, _check_type, configuration=None):
+                               json_variable_naming, _check_type, configuration=None):
     """Raises a TypeError is there is a problem, otherwise returns value
 
     Args:
@@ -1248,8 +1254,10 @@ def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
         path_to_item: (list) the path to the data being validated
             this stores a list of keys or indices to get to the data being
             validated
-        from_server (bool): True if data is from the server
-            False if data is from the client
+        json_variable_naming (bool): True if the variable names in the input
+            data are JSON names, i.e. as serialized.
+            False if the variables names in the input data are python
+            variable names in PEP-8 snake case.
         _check_type: (boolean) if true, type will be checked and conversion
             will be attempted.
         configuration: (Configuration): the configuration class to use
@@ -1277,7 +1285,7 @@ def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
                 valid_classes,
                 path_to_item,
                 configuration,
-                from_server,
+                json_variable_naming,
                 key_type=False,
                 must_convert=True
             )
@@ -1290,14 +1298,14 @@ def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
     if len(valid_classes) > 1 and configuration:
         # there are valid classes which are not the current class
         valid_classes_coercible = remove_uncoercible(
-            valid_classes, input_value, from_server, must_convert=False)
+            valid_classes, input_value, json_variable_naming, must_convert=False)
         if valid_classes_coercible:
             converted_instance = attempt_convert_item(
                 input_value,
                 valid_classes_coercible,
                 path_to_item,
                 configuration,
-                from_server,
+                json_variable_naming,
                 key_type=False,
                 must_convert=False
             )
@@ -1324,7 +1332,7 @@ def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
                 inner_value,
                 inner_required_types,
                 inner_path,
-                from_server,
+                json_variable_naming,
                 _check_type,
                 configuration=configuration
             )
@@ -1342,7 +1350,7 @@ def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
                 inner_val,
                 inner_required_types,
                 inner_path,
-                from_server,
+                json_variable_naming,
                 _check_type,
                 configuration=configuration
             )
@@ -1448,8 +1456,8 @@ def convert_js_args_to_python_args(fn):
     from functools import wraps
     @wraps(fn)
     def wrapped_init(self, *args, **kwargs):
-        from_server = kwargs.get('_from_server', False)
-        if from_server:
+        json_variable_naming = kwargs.get('_json_variable_naming', False)
+        if json_variable_naming:
             kwargs = change_keys_js_to_python(kwargs, self.__class__)
         return fn(self, *args, **kwargs)
     return wrapped_init
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/additional_properties_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/additional_properties_class.py
index 0dc65073d31e..3a35c878ccb0 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/additional_properties_class.py
@@ -95,14 +95,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """additional_properties_class.AdditionalPropertiesClass - a model defined in OpenAPI
 
         Keyword Args:
@@ -113,8 +113,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -140,7 +142,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/address.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/address.py
index a8a541d6c21c..dc3481900502 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/address.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/address.py
@@ -91,14 +91,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """address.Address - a model defined in OpenAPI
 
         Keyword Args:
@@ -109,8 +109,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -134,7 +136,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/animal.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/animal.py
index dc87c6bf9e14..73a4f0a888c2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/animal.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/animal.py
@@ -111,14 +111,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """animal.Animal - a model defined in OpenAPI
 
         Args:
@@ -132,8 +132,10 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -158,7 +160,7 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/api_response.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/api_response.py
index aa85a8d32c8e..db516ae58749 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/api_response.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/api_response.py
@@ -97,14 +97,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """api_response.ApiResponse - a model defined in OpenAPI
 
         Keyword Args:
@@ -115,8 +115,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -143,7 +145,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/apple.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/apple.py
index 1f4652a636e5..aea0f65306e1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/apple.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/apple.py
@@ -106,14 +106,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """apple.Apple - a model defined in OpenAPI
 
         Keyword Args:
@@ -124,8 +124,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -151,7 +153,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/apple_req.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/apple_req.py
index e0209f490b43..eba422d34658 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/apple_req.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/apple_req.py
@@ -95,14 +95,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, cultivar, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, cultivar, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """apple_req.AppleReq - a model defined in OpenAPI
 
         Args:
@@ -116,8 +116,10 @@ def __init__(self, cultivar, _check_type=True, _from_server=False, _path_to_item
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -142,7 +144,7 @@ def __init__(self, cultivar, _check_type=True, _from_server=False, _path_to_item
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/array_of_array_of_number_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/array_of_array_of_number_only.py
index 8648ca8e101e..2c87c8aaec5f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/array_of_array_of_number_only.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/array_of_array_of_number_only.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """array_of_array_of_number_only.ArrayOfArrayOfNumberOnly - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/array_of_number_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/array_of_number_only.py
index b457b27a8cb5..cebf5408970f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/array_of_number_only.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/array_of_number_only.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """array_of_number_only.ArrayOfNumberOnly - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/array_test.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/array_test.py
index 3733298e843c..47163960895d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/array_test.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/array_test.py
@@ -102,14 +102,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """array_test.ArrayTest - a model defined in OpenAPI
 
         Keyword Args:
@@ -120,8 +120,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -148,7 +150,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/banana.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/banana.py
index ea8e0969a483..5446c3773c07 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/banana.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/banana.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """banana.Banana - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/banana_req.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/banana_req.py
index 180a51d33a62..0aa89d4e1e61 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/banana_req.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/banana_req.py
@@ -95,14 +95,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, length_cm, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, length_cm, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """banana_req.BananaReq - a model defined in OpenAPI
 
         Args:
@@ -116,8 +116,10 @@ def __init__(self, length_cm, _check_type=True, _from_server=False, _path_to_ite
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -142,7 +144,7 @@ def __init__(self, length_cm, _check_type=True, _from_server=False, _path_to_ite
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_chordate.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_chordate.py
index 8fc8df668123..bde0a8252920 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_chordate.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_chordate.py
@@ -121,14 +121,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """biology_chordate.BiologyChordate - a model defined in OpenAPI
 
         Args:
@@ -142,8 +142,10 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -167,7 +169,7 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_hominid.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_hominid.py
index cd0165286aab..b03e566708ce 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_hominid.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_hominid.py
@@ -100,7 +100,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -110,7 +110,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """biology_hominid.BiologyHominid - a model defined in OpenAPI
 
         Args:
@@ -124,8 +124,10 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -149,7 +151,7 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -157,7 +159,7 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_from_server': _from_server,
+            '_json_variable_naming': _json_variable_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_mammal.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_mammal.py
index 38fad7b220f5..3eba39dea858 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_mammal.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_mammal.py
@@ -112,7 +112,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -122,7 +122,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """biology_mammal.BiologyMammal - a model defined in OpenAPI
 
         Args:
@@ -136,8 +136,10 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -161,7 +163,7 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -169,7 +171,7 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_from_server': _from_server,
+            '_json_variable_naming': _json_variable_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_primate.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_primate.py
index 1490bbc71e65..bb11fd7106ae 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_primate.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_primate.py
@@ -106,7 +106,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -116,7 +116,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """biology_primate.BiologyPrimate - a model defined in OpenAPI
 
         Args:
@@ -130,8 +130,10 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -155,7 +157,7 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -163,7 +165,7 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_from_server': _from_server,
+            '_json_variable_naming': _json_variable_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_reptile.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_reptile.py
index 81f40ad3377c..e9157ee3d482 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_reptile.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_reptile.py
@@ -100,7 +100,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -110,7 +110,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """biology_reptile.BiologyReptile - a model defined in OpenAPI
 
         Args:
@@ -124,8 +124,10 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -149,7 +151,7 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -157,7 +159,7 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_from_server': _from_server,
+            '_json_variable_naming': _json_variable_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/capitalization.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/capitalization.py
index 3ca42fba60be..3086efab3e3b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/capitalization.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/capitalization.py
@@ -103,14 +103,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """capitalization.Capitalization - a model defined in OpenAPI
 
         Keyword Args:
@@ -121,8 +121,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -152,7 +154,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/cat.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/cat.py
index 1916169c5126..a4d93019f7c9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/cat.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/cat.py
@@ -114,7 +114,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -124,7 +124,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """cat.Cat - a model defined in OpenAPI
 
         Args:
@@ -138,8 +138,10 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -165,7 +167,7 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -173,7 +175,7 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_from_server': _from_server,
+            '_json_variable_naming': _json_variable_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/cat_all_of.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/cat_all_of.py
index f008695b43ac..d7f02a59b6b8 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/cat_all_of.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/cat_all_of.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """cat_all_of.CatAllOf - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/category.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/category.py
index b34ba8ac0206..f39116c983c4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/category.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/category.py
@@ -95,14 +95,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, name='default-name', _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, name='default-name', _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """category.Category - a model defined in OpenAPI
 
         Args:
@@ -116,8 +116,10 @@ def __init__(self, name='default-name', _check_type=True, _from_server=False, _p
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -142,7 +144,7 @@ def __init__(self, name='default-name', _check_type=True, _from_server=False, _p
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/class_model.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/class_model.py
index a492a47164e7..5db2e1af5547 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/class_model.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/class_model.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """class_model.ClassModel - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/client.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/client.py
index 195e3d4209ca..bd5ce5ade76c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/client.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/client.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """client.Client - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/complex_quadrilateral.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/complex_quadrilateral.py
index 0be63bdcd2d6..308494e0dd28 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/complex_quadrilateral.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/complex_quadrilateral.py
@@ -103,7 +103,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -113,7 +113,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, shape_type, quadrilateral_type, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, shape_type, quadrilateral_type, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """complex_quadrilateral.ComplexQuadrilateral - a model defined in OpenAPI
 
         Args:
@@ -128,8 +128,10 @@ def __init__(self, shape_type, quadrilateral_type, _check_type=True, _from_serve
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -153,7 +155,7 @@ def __init__(self, shape_type, quadrilateral_type, _check_type=True, _from_serve
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -161,7 +163,7 @@ def __init__(self, shape_type, quadrilateral_type, _check_type=True, _from_serve
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_from_server': _from_server,
+            '_json_variable_naming': _json_variable_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/dog.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/dog.py
index de8d27972b1a..3f55b0a81a40 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/dog.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/dog.py
@@ -109,7 +109,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -119,7 +119,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """dog.Dog - a model defined in OpenAPI
 
         Args:
@@ -133,8 +133,10 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -160,7 +162,7 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -168,7 +170,7 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_from_server': _from_server,
+            '_json_variable_naming': _json_variable_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/dog_all_of.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/dog_all_of.py
index 6278289267d5..33b5478fc206 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/dog_all_of.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/dog_all_of.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """dog_all_of.DogAllOf - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/drawing.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/drawing.py
index 0eec63241a09..6bf63b5d3578 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/drawing.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/drawing.py
@@ -114,14 +114,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """drawing.Drawing - a model defined in OpenAPI
 
         Keyword Args:
@@ -132,8 +132,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -161,7 +163,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/enum_arrays.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/enum_arrays.py
index 107e1f3e0f8f..f2d46eb36037 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/enum_arrays.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/enum_arrays.py
@@ -103,14 +103,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """enum_arrays.EnumArrays - a model defined in OpenAPI
 
         Keyword Args:
@@ -121,8 +121,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -148,7 +150,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/enum_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/enum_class.py
index 4323ac7f0856..9185052ee078 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/enum_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/enum_class.py
@@ -90,14 +90,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, value='-efg', _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, value='-efg', _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """enum_class.EnumClass - a model defined in OpenAPI
 
         Args:
@@ -111,8 +111,10 @@ def __init__(self, value='-efg', _check_type=True, _from_server=False, _path_to_
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -136,7 +138,7 @@ def __init__(self, value='-efg', _check_type=True, _from_server=False, _path_to_
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/enum_test.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/enum_test.py
index 83043b7c4315..e63009c2db02 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/enum_test.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/enum_test.py
@@ -145,14 +145,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, enum_string_required, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, enum_string_required, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """enum_test.EnumTest - a model defined in OpenAPI
 
         Args:
@@ -166,8 +166,10 @@ def __init__(self, enum_string_required, _check_type=True, _from_server=False, _
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -198,7 +200,7 @@ def __init__(self, enum_string_required, _check_type=True, _from_server=False, _
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/equilateral_triangle.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/equilateral_triangle.py
index 90c79fd2bbcc..0d28442965d4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/equilateral_triangle.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/equilateral_triangle.py
@@ -103,7 +103,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -113,7 +113,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, shape_type, triangle_type, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, shape_type, triangle_type, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """equilateral_triangle.EquilateralTriangle - a model defined in OpenAPI
 
         Args:
@@ -128,8 +128,10 @@ def __init__(self, shape_type, triangle_type, _check_type=True, _from_server=Fal
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -153,7 +155,7 @@ def __init__(self, shape_type, triangle_type, _check_type=True, _from_server=Fal
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -161,7 +163,7 @@ def __init__(self, shape_type, triangle_type, _check_type=True, _from_server=Fal
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_from_server': _from_server,
+            '_json_variable_naming': _json_variable_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/file.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/file.py
index 0f21a84df498..e250c79fda4e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/file.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/file.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """file.File - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/file_schema_test_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/file_schema_test_class.py
index 2715cfdbfd55..874969d8a892 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/file_schema_test_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/file_schema_test_class.py
@@ -100,14 +100,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """file_schema_test_class.FileSchemaTestClass - a model defined in OpenAPI
 
         Keyword Args:
@@ -118,8 +118,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -145,7 +147,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/foo.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/foo.py
index 6e88c734c966..4b98b158e768 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/foo.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/foo.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """foo.Foo - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/format_test.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/format_test.py
index 24601b9499c2..3121c1e49148 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/format_test.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/format_test.py
@@ -164,14 +164,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, number, byte, date, password, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, number, byte, date, password, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """format_test.FormatTest - a model defined in OpenAPI
 
         Args:
@@ -188,8 +188,10 @@ def __init__(self, number, byte, date, password, _check_type=True, _from_server=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -224,7 +226,7 @@ def __init__(self, number, byte, date, password, _check_type=True, _from_server=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/fruit.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/fruit.py
index cc33a3d9ec3e..9e6f9cfd7de0 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/fruit.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/fruit.py
@@ -118,7 +118,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -128,7 +128,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """fruit.Fruit - a model defined in OpenAPI
 
         Keyword Args:
@@ -139,8 +139,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -168,7 +170,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -176,7 +178,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_from_server': _from_server,
+            '_json_variable_naming': _json_variable_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/fruit_req.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/fruit_req.py
index 130f8781a7f3..6b7523371550 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/fruit_req.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/fruit_req.py
@@ -107,7 +107,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -117,7 +117,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, cultivar=nulltype.Null, length_cm=nulltype.Null, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, cultivar=nulltype.Null, length_cm=nulltype.Null, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """fruit_req.FruitReq - a model defined in OpenAPI
 
         Args:
@@ -132,8 +132,10 @@ def __init__(self, cultivar=nulltype.Null, length_cm=nulltype.Null, _check_type=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -159,7 +161,7 @@ def __init__(self, cultivar=nulltype.Null, length_cm=nulltype.Null, _check_type=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -167,7 +169,7 @@ def __init__(self, cultivar=nulltype.Null, length_cm=nulltype.Null, _check_type=
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_from_server': _from_server,
+            '_json_variable_naming': _json_variable_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/gm_fruit.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/gm_fruit.py
index d40836a3076f..25602e15c206 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/gm_fruit.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/gm_fruit.py
@@ -118,7 +118,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -128,7 +128,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """gm_fruit.GmFruit - a model defined in OpenAPI
 
         Keyword Args:
@@ -139,8 +139,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -168,7 +170,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -176,7 +178,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_from_server': _from_server,
+            '_json_variable_naming': _json_variable_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/has_only_read_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/has_only_read_only.py
index 974136a56a6f..22623afe8169 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/has_only_read_only.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/has_only_read_only.py
@@ -95,14 +95,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """has_only_read_only.HasOnlyReadOnly - a model defined in OpenAPI
 
         Keyword Args:
@@ -113,8 +113,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -140,7 +142,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/health_check_result.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/health_check_result.py
index 662cf79189ff..daeec2716e6b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/health_check_result.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/health_check_result.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """health_check_result.HealthCheckResult - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object.py
index 5de65e44476e..ffff566e5a22 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object.py
@@ -95,14 +95,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """inline_object.InlineObject - a model defined in OpenAPI
 
         Keyword Args:
@@ -113,8 +113,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -140,7 +142,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object1.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object1.py
index 03ec7a1908c9..4a84000a9488 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object1.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object1.py
@@ -95,14 +95,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """inline_object1.InlineObject1 - a model defined in OpenAPI
 
         Keyword Args:
@@ -113,8 +113,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -140,7 +142,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object2.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object2.py
index 701f8f8985b9..3c33992a86b6 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object2.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object2.py
@@ -104,14 +104,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """inline_object2.InlineObject2 - a model defined in OpenAPI
 
         Keyword Args:
@@ -122,8 +122,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -149,7 +151,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object3.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object3.py
index e720690a0550..bc2f940ccc42 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object3.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object3.py
@@ -153,14 +153,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, number, double, pattern_without_delimiter, byte, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, number, double, pattern_without_delimiter, byte, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """inline_object3.InlineObject3 - a model defined in OpenAPI
 
         Args:
@@ -177,8 +177,10 @@ def __init__(self, number, double, pattern_without_delimiter, byte, _check_type=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -212,7 +214,7 @@ def __init__(self, number, double, pattern_without_delimiter, byte, _check_type=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object4.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object4.py
index dd5ade491376..984bf598e72a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object4.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object4.py
@@ -95,14 +95,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, param, param2, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, param, param2, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """inline_object4.InlineObject4 - a model defined in OpenAPI
 
         Args:
@@ -117,8 +117,10 @@ def __init__(self, param, param2, _check_type=True, _from_server=False, _path_to
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -142,7 +144,7 @@ def __init__(self, param, param2, _check_type=True, _from_server=False, _path_to
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object5.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object5.py
index b133b4026884..6e45f5b0f296 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object5.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object5.py
@@ -95,14 +95,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, required_file, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, required_file, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """inline_object5.InlineObject5 - a model defined in OpenAPI
 
         Args:
@@ -116,8 +116,10 @@ def __init__(self, required_file, _check_type=True, _from_server=False, _path_to
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -142,7 +144,7 @@ def __init__(self, required_file, _check_type=True, _from_server=False, _path_to
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_response_default.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_response_default.py
index 1ef604607e67..bcb80054dc5a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_response_default.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_response_default.py
@@ -98,14 +98,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """inline_response_default.InlineResponseDefault - a model defined in OpenAPI
 
         Keyword Args:
@@ -116,8 +116,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -142,7 +144,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/isosceles_triangle.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/isosceles_triangle.py
index 6ef7500c2c62..e2f67fc58465 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/isosceles_triangle.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/isosceles_triangle.py
@@ -103,7 +103,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -113,7 +113,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, shape_type, triangle_type, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, shape_type, triangle_type, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """isosceles_triangle.IsoscelesTriangle - a model defined in OpenAPI
 
         Args:
@@ -128,8 +128,10 @@ def __init__(self, shape_type, triangle_type, _check_type=True, _from_server=Fal
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -153,7 +155,7 @@ def __init__(self, shape_type, triangle_type, _check_type=True, _from_server=Fal
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -161,7 +163,7 @@ def __init__(self, shape_type, triangle_type, _check_type=True, _from_server=Fal
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_from_server': _from_server,
+            '_json_variable_naming': _json_variable_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/list.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/list.py
index 3f85acb2e4d3..772d64c877bd 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/list.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/list.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """list.List - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/mammal.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/mammal.py
index 1d4a80e0c7cd..b51697d25ce1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/mammal.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/mammal.py
@@ -118,7 +118,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -128,7 +128,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """mammal.Mammal - a model defined in OpenAPI
 
         Args:
@@ -142,8 +142,10 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -170,7 +172,7 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -178,7 +180,7 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_from_server': _from_server,
+            '_json_variable_naming': _json_variable_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/map_test.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/map_test.py
index e3510cef772f..487e2a3793f5 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/map_test.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/map_test.py
@@ -108,14 +108,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """map_test.MapTest - a model defined in OpenAPI
 
         Keyword Args:
@@ -126,8 +126,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -155,7 +157,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/mixed_properties_and_additional_properties_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/mixed_properties_and_additional_properties_class.py
index 36f5add3db88..42a9b15b86fb 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/mixed_properties_and_additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/mixed_properties_and_additional_properties_class.py
@@ -102,14 +102,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """mixed_properties_and_additional_properties_class.MixedPropertiesAndAdditionalPropertiesClass - a model defined in OpenAPI
 
         Keyword Args:
@@ -120,8 +120,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -148,7 +150,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/model200_response.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/model200_response.py
index 96d39402d563..bc00b7694177 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/model200_response.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/model200_response.py
@@ -95,14 +95,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """model200_response.Model200Response - a model defined in OpenAPI
 
         Keyword Args:
@@ -113,8 +113,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -140,7 +142,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/model_return.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/model_return.py
index f9213c37ea7e..76f4315edc86 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/model_return.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/model_return.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """model_return.ModelReturn - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/name.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/name.py
index b2fce89ec9b7..fc7922375034 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/name.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/name.py
@@ -99,14 +99,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, name, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, name, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """name.Name - a model defined in OpenAPI
 
         Args:
@@ -120,8 +120,10 @@ def __init__(self, name, _check_type=True, _from_server=False, _path_to_item=(),
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -148,7 +150,7 @@ def __init__(self, name, _check_type=True, _from_server=False, _path_to_item=(),
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/nullable_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/nullable_class.py
index 89d8720a969c..a6de58a90327 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/nullable_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/nullable_class.py
@@ -115,14 +115,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """nullable_class.NullableClass - a model defined in OpenAPI
 
         Keyword Args:
@@ -133,8 +133,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -170,7 +172,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/nullable_shape.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/nullable_shape.py
index 5ea4593b1fae..16c86a0d8f1b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/nullable_shape.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/nullable_shape.py
@@ -111,7 +111,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -121,7 +121,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, shape_type, quadrilateral_type=nulltype.Null, triangle_type=nulltype.Null, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, shape_type, quadrilateral_type=nulltype.Null, triangle_type=nulltype.Null, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """nullable_shape.NullableShape - a model defined in OpenAPI
 
         Args:
@@ -137,8 +137,10 @@ def __init__(self, shape_type, quadrilateral_type=nulltype.Null, triangle_type=n
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -162,7 +164,7 @@ def __init__(self, shape_type, quadrilateral_type=nulltype.Null, triangle_type=n
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -170,7 +172,7 @@ def __init__(self, shape_type, quadrilateral_type=nulltype.Null, triangle_type=n
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_from_server': _from_server,
+            '_json_variable_naming': _json_variable_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/number_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/number_only.py
index 896757360765..ca0e364039f4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/number_only.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/number_only.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """number_only.NumberOnly - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/order.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/order.py
index 6ff62a572333..d43a0b84de2e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/order.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/order.py
@@ -108,14 +108,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """order.Order - a model defined in OpenAPI
 
         Keyword Args:
@@ -126,8 +126,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -157,7 +159,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_composite.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_composite.py
index da7cbd159058..8e894dbd0bf2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_composite.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_composite.py
@@ -97,14 +97,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """outer_composite.OuterComposite - a model defined in OpenAPI
 
         Keyword Args:
@@ -115,8 +115,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -143,7 +145,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_enum.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_enum.py
index 7c09a5b8d59a..01abd423a79c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_enum.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_enum.py
@@ -91,14 +91,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, value, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, value, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """outer_enum.OuterEnum - a model defined in OpenAPI
 
         Args:
@@ -112,8 +112,10 @@ def __init__(self, value, _check_type=True, _from_server=False, _path_to_item=()
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, value, _check_type=True, _from_server=False, _path_to_item=()
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_enum_default_value.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_enum_default_value.py
index fdc882ee5dba..079df1a4eace 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_enum_default_value.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_enum_default_value.py
@@ -90,14 +90,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, value='placed', _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, value='placed', _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """outer_enum_default_value.OuterEnumDefaultValue - a model defined in OpenAPI
 
         Args:
@@ -111,8 +111,10 @@ def __init__(self, value='placed', _check_type=True, _from_server=False, _path_t
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -136,7 +138,7 @@ def __init__(self, value='placed', _check_type=True, _from_server=False, _path_t
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_enum_integer.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_enum_integer.py
index 187a714b33bf..e4933835b3d9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_enum_integer.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_enum_integer.py
@@ -90,14 +90,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, value, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, value, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """outer_enum_integer.OuterEnumInteger - a model defined in OpenAPI
 
         Args:
@@ -111,8 +111,10 @@ def __init__(self, value, _check_type=True, _from_server=False, _path_to_item=()
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -136,7 +138,7 @@ def __init__(self, value, _check_type=True, _from_server=False, _path_to_item=()
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_enum_integer_default_value.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_enum_integer_default_value.py
index 41da57604fc8..a5d319855f78 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_enum_integer_default_value.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_enum_integer_default_value.py
@@ -90,14 +90,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, value=0, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, value=0, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """outer_enum_integer_default_value.OuterEnumIntegerDefaultValue - a model defined in OpenAPI
 
         Args:
@@ -111,8 +111,10 @@ def __init__(self, value=0, _check_type=True, _from_server=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -136,7 +138,7 @@ def __init__(self, value=0, _check_type=True, _from_server=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/pet.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/pet.py
index 1b34db901312..6f442d55ba60 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/pet.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/pet.py
@@ -118,14 +118,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, name, photo_urls, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, name, photo_urls, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """pet.Pet - a model defined in OpenAPI
 
         Args:
@@ -140,8 +140,10 @@ def __init__(self, name, photo_urls, _check_type=True, _from_server=False, _path
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -169,7 +171,7 @@ def __init__(self, name, photo_urls, _check_type=True, _from_server=False, _path
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/quadrilateral.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/quadrilateral.py
index b50f8fb77864..c110dc04370a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/quadrilateral.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/quadrilateral.py
@@ -109,7 +109,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -119,7 +119,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, quadrilateral_type, shape_type=nulltype.Null, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, quadrilateral_type, shape_type=nulltype.Null, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """quadrilateral.Quadrilateral - a model defined in OpenAPI
 
         Args:
@@ -134,8 +134,10 @@ def __init__(self, quadrilateral_type, shape_type=nulltype.Null, _check_type=Tru
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -159,7 +161,7 @@ def __init__(self, quadrilateral_type, shape_type=nulltype.Null, _check_type=Tru
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -167,7 +169,7 @@ def __init__(self, quadrilateral_type, shape_type=nulltype.Null, _check_type=Tru
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_from_server': _from_server,
+            '_json_variable_naming': _json_variable_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/quadrilateral_interface.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/quadrilateral_interface.py
index 2f60ea9362dc..87173f023755 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/quadrilateral_interface.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/quadrilateral_interface.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, quadrilateral_type, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, quadrilateral_type, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """quadrilateral_interface.QuadrilateralInterface - a model defined in OpenAPI
 
         Args:
@@ -114,8 +114,10 @@ def __init__(self, quadrilateral_type, _check_type=True, _from_server=False, _pa
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -139,7 +141,7 @@ def __init__(self, quadrilateral_type, _check_type=True, _from_server=False, _pa
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/read_only_first.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/read_only_first.py
index 8c6d80c71f16..5968c992a38c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/read_only_first.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/read_only_first.py
@@ -95,14 +95,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """read_only_first.ReadOnlyFirst - a model defined in OpenAPI
 
         Keyword Args:
@@ -113,8 +113,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -140,7 +142,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/scalene_triangle.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/scalene_triangle.py
index 8a9b46fd4c6f..6819f3303bd5 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/scalene_triangle.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/scalene_triangle.py
@@ -103,7 +103,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -113,7 +113,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, shape_type, triangle_type, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, shape_type, triangle_type, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """scalene_triangle.ScaleneTriangle - a model defined in OpenAPI
 
         Args:
@@ -128,8 +128,10 @@ def __init__(self, shape_type, triangle_type, _check_type=True, _from_server=Fal
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -153,7 +155,7 @@ def __init__(self, shape_type, triangle_type, _check_type=True, _from_server=Fal
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -161,7 +163,7 @@ def __init__(self, shape_type, triangle_type, _check_type=True, _from_server=Fal
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_from_server': _from_server,
+            '_json_variable_naming': _json_variable_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/shape.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/shape.py
index d334ceac0d97..5d656c7e41c0 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/shape.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/shape.py
@@ -111,7 +111,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -121,7 +121,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, shape_type, quadrilateral_type=nulltype.Null, triangle_type=nulltype.Null, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, shape_type, quadrilateral_type=nulltype.Null, triangle_type=nulltype.Null, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """shape.Shape - a model defined in OpenAPI
 
         Args:
@@ -137,8 +137,10 @@ def __init__(self, shape_type, quadrilateral_type=nulltype.Null, triangle_type=n
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -162,7 +164,7 @@ def __init__(self, shape_type, quadrilateral_type=nulltype.Null, triangle_type=n
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -170,7 +172,7 @@ def __init__(self, shape_type, quadrilateral_type=nulltype.Null, triangle_type=n
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_from_server': _from_server,
+            '_json_variable_naming': _json_variable_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/shape_interface.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/shape_interface.py
index 1152adfc8a48..35e54867ba4c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/shape_interface.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/shape_interface.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, shape_type, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, shape_type, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """shape_interface.ShapeInterface - a model defined in OpenAPI
 
         Args:
@@ -114,8 +114,10 @@ def __init__(self, shape_type, _check_type=True, _from_server=False, _path_to_it
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -139,7 +141,7 @@ def __init__(self, shape_type, _check_type=True, _from_server=False, _path_to_it
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/shape_or_null.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/shape_or_null.py
index 6f884f082ab5..93a80fda8942 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/shape_or_null.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/shape_or_null.py
@@ -111,7 +111,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -121,7 +121,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, shape_type, quadrilateral_type=nulltype.Null, triangle_type=nulltype.Null, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, shape_type, quadrilateral_type=nulltype.Null, triangle_type=nulltype.Null, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """shape_or_null.ShapeOrNull - a model defined in OpenAPI
 
         Args:
@@ -137,8 +137,10 @@ def __init__(self, shape_type, quadrilateral_type=nulltype.Null, triangle_type=n
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -162,7 +164,7 @@ def __init__(self, shape_type, quadrilateral_type=nulltype.Null, triangle_type=n
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -170,7 +172,7 @@ def __init__(self, shape_type, quadrilateral_type=nulltype.Null, triangle_type=n
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_from_server': _from_server,
+            '_json_variable_naming': _json_variable_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/simple_quadrilateral.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/simple_quadrilateral.py
index cd92ebf412e8..c3c22c8f1ace 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/simple_quadrilateral.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/simple_quadrilateral.py
@@ -103,7 +103,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -113,7 +113,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, shape_type, quadrilateral_type, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, shape_type, quadrilateral_type, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """simple_quadrilateral.SimpleQuadrilateral - a model defined in OpenAPI
 
         Args:
@@ -128,8 +128,10 @@ def __init__(self, shape_type, quadrilateral_type, _check_type=True, _from_serve
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -153,7 +155,7 @@ def __init__(self, shape_type, quadrilateral_type, _check_type=True, _from_serve
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -161,7 +163,7 @@ def __init__(self, shape_type, quadrilateral_type, _check_type=True, _from_serve
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_from_server': _from_server,
+            '_json_variable_naming': _json_variable_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/special_model_name.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/special_model_name.py
index 168554fa343e..42e4dd0dfe39 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/special_model_name.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/special_model_name.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """special_model_name.SpecialModelName - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -137,7 +139,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/string_boolean_map.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/string_boolean_map.py
index 10d0a9882261..3c117269fd32 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/string_boolean_map.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/string_boolean_map.py
@@ -91,14 +91,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """string_boolean_map.StringBooleanMap - a model defined in OpenAPI
 
         Keyword Args:
@@ -109,8 +109,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -134,7 +136,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/tag.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/tag.py
index 26cdd6f50922..7efefe09c4c4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/tag.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/tag.py
@@ -95,14 +95,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """tag.Tag - a model defined in OpenAPI
 
         Keyword Args:
@@ -113,8 +113,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -140,7 +142,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/triangle.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/triangle.py
index c37a9f93fb2b..b8cb767dc2a6 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/triangle.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/triangle.py
@@ -115,7 +115,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -125,7 +125,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, triangle_type, shape_type=nulltype.Null, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, triangle_type, shape_type=nulltype.Null, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """triangle.Triangle - a model defined in OpenAPI
 
         Args:
@@ -140,8 +140,10 @@ def __init__(self, triangle_type, shape_type=nulltype.Null, _check_type=True, _f
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -165,7 +167,7 @@ def __init__(self, triangle_type, shape_type=nulltype.Null, _check_type=True, _f
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -173,7 +175,7 @@ def __init__(self, triangle_type, shape_type=nulltype.Null, _check_type=True, _f
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_from_server': _from_server,
+            '_json_variable_naming': _json_variable_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/triangle_interface.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/triangle_interface.py
index 5881e3c94728..20bd0d802b63 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/triangle_interface.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/triangle_interface.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, triangle_type, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, triangle_type, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """triangle_interface.TriangleInterface - a model defined in OpenAPI
 
         Args:
@@ -114,8 +114,10 @@ def __init__(self, triangle_type, _check_type=True, _from_server=False, _path_to
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -139,7 +141,7 @@ def __init__(self, triangle_type, _check_type=True, _from_server=False, _path_to
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/user.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/user.py
index b8d64ff38c3a..6a7de9069393 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/user.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/user.py
@@ -115,14 +115,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """user.User - a model defined in OpenAPI
 
         Keyword Args:
@@ -133,8 +133,10 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -170,7 +172,7 @@ def __init__(self, _check_type=True, _from_server=False, _path_to_item=(), _conf
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/whale.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/whale.py
index c89497b6b556..98276d737bed 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/whale.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/whale.py
@@ -97,14 +97,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """whale.Whale - a model defined in OpenAPI
 
         Args:
@@ -118,8 +118,10 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -145,7 +147,7 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/zebra.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/zebra.py
index 53c8a1dc2dee..0761e1d04031 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/zebra.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/zebra.py
@@ -100,14 +100,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """zebra.Zebra - a model defined in OpenAPI
 
         Args:
@@ -121,8 +121,10 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
-                                False if the data is from the client (default)
+            _json_variable_naming (bool): True if the variable names in the input data
+                                are JSON names, as listed in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
                                 If passed, type conversion is attempted
@@ -147,7 +149,7 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)

From 21c399440775bd1d72a9a65184f868be3f411f24 Mon Sep 17 00:00:00 2001
From: "Sebastien Rosset (serosset)" <serosset@cisco.com>
Date: Thu, 21 May 2020 19:10:49 -0700
Subject: [PATCH 04/11] rename from_server to json_variable_naming

---
 .../petstore_api/models/gm_mammal.py               | 14 +++++++-------
 .../python-experimental/test/test_drawing.py       |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/gm_mammal.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/gm_mammal.py
index 83ef04f9707f..40d056a494ec 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/gm_mammal.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/gm_mammal.py
@@ -118,7 +118,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_from_server',
+        '_json_variable_naming',
         '_path_to_item',
         '_configuration',
         '_composed_instances',
@@ -126,7 +126,7 @@ def discriminator():
         '_additional_properties_model_instances',
     ])
 
-    def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_item=(), _configuration=None, **kwargs):  # noqa: E501
+    def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, **kwargs):  # noqa: E501
         """gm_mammal.GmMammal - a model defined in OpenAPI
 
         Args:
@@ -140,7 +140,7 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _from_server (bool): True if the data is from the server
+            _json_variable_naming (bool): True if the data is from the server
                                 False if the data is from the client (default)
             _configuration (Configuration): the instance to use when
                                 deserializing a file_type parameter.
@@ -154,14 +154,14 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
 
         self._data_store = {}
         self._check_type = _check_type
-        self._from_server = _from_server
+        self._json_variable_naming = _json_variable_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
 
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_from_server': _from_server,
+            '_json_variable_naming': _json_variable_naming,
             '_configuration': _configuration,
         }
         model_args = {
@@ -199,12 +199,12 @@ def _composed_schemas():
         }
 
     @classmethod
-    def get_discriminator_class(cls, from_server, data):
+    def get_discriminator_class(cls, json_variable_naming, data):
         """Returns the child class specified by the discriminator"""
         discriminator = cls.discriminator()
         discr_propertyname_py = list(discriminator.keys())[0]
         discr_propertyname_js = cls.attribute_map[discr_propertyname_py]
-        if from_server:
+        if json_variable_naming:
             class_name = data[discr_propertyname_js]
         else:
             class_name = data[discr_propertyname_py]
diff --git a/samples/openapi3/client/petstore/python-experimental/test/test_drawing.py b/samples/openapi3/client/petstore/python-experimental/test/test_drawing.py
index ab772bdbe6d2..12509db83862 100644
--- a/samples/openapi3/client/petstore/python-experimental/test/test_drawing.py
+++ b/samples/openapi3/client/petstore/python-experimental/test/test_drawing.py
@@ -45,7 +45,7 @@ def test_create_instances(self):
               'shapeType': "Triangle",
               'triangleType': "IsoscelesTriangle"
         }
-        inst = petstore_api.Shape(**data, _from_server=True)
+        inst = petstore_api.Shape(**data, _json_variable_naming=True)
         assert isinstance(inst, petstore_api.IsoscelesTriangle)
 
     def test_deserialize_oneof_reference(self):

From 8112ebb4c4dd667d7a6a1c459f7121a9c3e89471 Mon Sep 17 00:00:00 2001
From: "Sebastien Rosset (serosset)" <serosset@cisco.com>
Date: Thu, 21 May 2020 19:18:41 -0700
Subject: [PATCH 05/11] fix code so it can execute in python 2.x

---
 .../client/petstore/python-experimental/test/test_drawing.py    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/openapi3/client/petstore/python-experimental/test/test_drawing.py b/samples/openapi3/client/petstore/python-experimental/test/test_drawing.py
index 12509db83862..be18468b4d42 100644
--- a/samples/openapi3/client/petstore/python-experimental/test/test_drawing.py
+++ b/samples/openapi3/client/petstore/python-experimental/test/test_drawing.py
@@ -45,7 +45,7 @@ def test_create_instances(self):
               'shapeType': "Triangle",
               'triangleType': "IsoscelesTriangle"
         }
-        inst = petstore_api.Shape(**data, _json_variable_naming=True)
+        inst = petstore_api.Shape(_json_variable_naming=True, **data)
         assert isinstance(inst, petstore_api.IsoscelesTriangle)
 
     def test_deserialize_oneof_reference(self):

From 6018ee4331a035724bafc9b76ad4286bbb3acbaf Mon Sep 17 00:00:00 2001
From: "Sebastien Rosset (serosset)" <serosset@cisco.com>
Date: Thu, 21 May 2020 22:38:03 -0700
Subject: [PATCH 06/11] rename variable

---
 .../method_init_composed.mustache             |  4 +-
 .../method_init_normal.mustache               |  2 +-
 .../method_init_shared.mustache               |  8 ++--
 .../method_set_attribute.mustache             |  2 +-
 .../python-experimental/model_utils.mustache  | 46 +++++++++---------
 .../petstore_api/model_utils.py               | 48 +++++++++----------
 .../models/additional_properties_any_type.py  | 10 ++--
 .../models/additional_properties_array.py     | 10 ++--
 .../models/additional_properties_boolean.py   | 10 ++--
 .../models/additional_properties_class.py     | 10 ++--
 .../models/additional_properties_integer.py   | 10 ++--
 .../models/additional_properties_number.py    | 10 ++--
 .../models/additional_properties_object.py    | 10 ++--
 .../models/additional_properties_string.py    | 10 ++--
 .../petstore_api/models/animal.py             | 10 ++--
 .../petstore_api/models/api_response.py       | 10 ++--
 .../models/array_of_array_of_number_only.py   | 10 ++--
 .../models/array_of_number_only.py            | 10 ++--
 .../petstore_api/models/array_test.py         | 10 ++--
 .../petstore_api/models/capitalization.py     | 10 ++--
 .../petstore_api/models/cat.py                | 12 ++---
 .../petstore_api/models/cat_all_of.py         | 10 ++--
 .../petstore_api/models/category.py           | 10 ++--
 .../petstore_api/models/child.py              | 12 ++---
 .../petstore_api/models/child_all_of.py       | 10 ++--
 .../petstore_api/models/child_cat.py          | 12 ++---
 .../petstore_api/models/child_cat_all_of.py   | 10 ++--
 .../petstore_api/models/child_dog.py          | 12 ++---
 .../petstore_api/models/child_dog_all_of.py   | 10 ++--
 .../petstore_api/models/child_lizard.py       | 12 ++---
 .../models/child_lizard_all_of.py             | 10 ++--
 .../petstore_api/models/class_model.py        | 10 ++--
 .../petstore_api/models/client.py             | 10 ++--
 .../petstore_api/models/dog.py                | 12 ++---
 .../petstore_api/models/dog_all_of.py         | 10 ++--
 .../petstore_api/models/enum_arrays.py        | 10 ++--
 .../petstore_api/models/enum_class.py         | 10 ++--
 .../petstore_api/models/enum_test.py          | 10 ++--
 .../petstore_api/models/file.py               | 10 ++--
 .../models/file_schema_test_class.py          | 10 ++--
 .../petstore_api/models/format_test.py        | 10 ++--
 .../petstore_api/models/grandparent.py        | 10 ++--
 .../petstore_api/models/grandparent_animal.py | 10 ++--
 .../petstore_api/models/has_only_read_only.py | 10 ++--
 .../petstore_api/models/list.py               | 10 ++--
 .../petstore_api/models/map_test.py           | 10 ++--
 ...perties_and_additional_properties_class.py | 10 ++--
 .../petstore_api/models/model200_response.py  | 10 ++--
 .../petstore_api/models/model_return.py       | 10 ++--
 .../petstore_api/models/name.py               | 10 ++--
 .../petstore_api/models/number_only.py        | 10 ++--
 .../petstore_api/models/order.py              | 10 ++--
 .../petstore_api/models/outer_composite.py    | 10 ++--
 .../petstore_api/models/outer_enum.py         | 10 ++--
 .../petstore_api/models/outer_number.py       | 10 ++--
 .../petstore_api/models/parent.py             | 12 ++---
 .../petstore_api/models/parent_all_of.py      | 10 ++--
 .../petstore_api/models/parent_pet.py         | 12 ++---
 .../petstore_api/models/pet.py                | 10 ++--
 .../petstore_api/models/player.py             | 10 ++--
 .../petstore_api/models/read_only_first.py    | 10 ++--
 .../petstore_api/models/special_model_name.py | 10 ++--
 .../petstore_api/models/string_boolean_map.py | 10 ++--
 .../petstore_api/models/tag.py                | 10 ++--
 .../models/type_holder_default.py             | 10 ++--
 .../models/type_holder_example.py             | 10 ++--
 .../petstore_api/models/user.py               | 10 ++--
 .../petstore_api/models/xml_item.py           | 10 ++--
 .../petstore_api/model_utils.py               | 48 +++++++++----------
 .../models/additional_properties_class.py     | 10 ++--
 .../petstore_api/models/address.py            | 10 ++--
 .../petstore_api/models/animal.py             | 10 ++--
 .../petstore_api/models/api_response.py       | 10 ++--
 .../petstore_api/models/apple.py              | 10 ++--
 .../petstore_api/models/apple_req.py          | 10 ++--
 .../models/array_of_array_of_number_only.py   | 10 ++--
 .../models/array_of_number_only.py            | 10 ++--
 .../petstore_api/models/array_test.py         | 10 ++--
 .../petstore_api/models/banana.py             | 10 ++--
 .../petstore_api/models/banana_req.py         | 10 ++--
 .../petstore_api/models/biology_chordate.py   | 10 ++--
 .../petstore_api/models/biology_hominid.py    | 12 ++---
 .../petstore_api/models/biology_mammal.py     | 12 ++---
 .../petstore_api/models/biology_primate.py    | 12 ++---
 .../petstore_api/models/biology_reptile.py    | 12 ++---
 .../petstore_api/models/capitalization.py     | 10 ++--
 .../petstore_api/models/cat.py                | 12 ++---
 .../petstore_api/models/cat_all_of.py         | 10 ++--
 .../petstore_api/models/category.py           | 10 ++--
 .../petstore_api/models/class_model.py        | 10 ++--
 .../petstore_api/models/client.py             | 10 ++--
 .../models/complex_quadrilateral.py           | 12 ++---
 .../petstore_api/models/dog.py                | 12 ++---
 .../petstore_api/models/dog_all_of.py         | 10 ++--
 .../petstore_api/models/drawing.py            | 10 ++--
 .../petstore_api/models/enum_arrays.py        | 10 ++--
 .../petstore_api/models/enum_class.py         | 10 ++--
 .../petstore_api/models/enum_test.py          | 10 ++--
 .../models/equilateral_triangle.py            | 12 ++---
 .../petstore_api/models/file.py               | 10 ++--
 .../models/file_schema_test_class.py          | 10 ++--
 .../petstore_api/models/foo.py                | 10 ++--
 .../petstore_api/models/format_test.py        | 10 ++--
 .../petstore_api/models/fruit.py              | 12 ++---
 .../petstore_api/models/fruit_req.py          | 12 ++---
 .../petstore_api/models/gm_fruit.py           | 12 ++---
 .../petstore_api/models/has_only_read_only.py | 10 ++--
 .../models/health_check_result.py             | 10 ++--
 .../petstore_api/models/inline_object.py      | 10 ++--
 .../petstore_api/models/inline_object1.py     | 10 ++--
 .../petstore_api/models/inline_object2.py     | 10 ++--
 .../petstore_api/models/inline_object3.py     | 10 ++--
 .../petstore_api/models/inline_object4.py     | 10 ++--
 .../petstore_api/models/inline_object5.py     | 10 ++--
 .../models/inline_response_default.py         | 10 ++--
 .../petstore_api/models/isosceles_triangle.py | 12 ++---
 .../petstore_api/models/list.py               | 10 ++--
 .../petstore_api/models/mammal.py             | 12 ++---
 .../petstore_api/models/map_test.py           | 10 ++--
 ...perties_and_additional_properties_class.py | 10 ++--
 .../petstore_api/models/model200_response.py  | 10 ++--
 .../petstore_api/models/model_return.py       | 10 ++--
 .../petstore_api/models/name.py               | 10 ++--
 .../petstore_api/models/nullable_class.py     | 10 ++--
 .../petstore_api/models/nullable_shape.py     | 12 ++---
 .../petstore_api/models/number_only.py        | 10 ++--
 .../petstore_api/models/order.py              | 10 ++--
 .../petstore_api/models/outer_composite.py    | 10 ++--
 .../petstore_api/models/outer_enum.py         | 10 ++--
 .../models/outer_enum_default_value.py        | 10 ++--
 .../petstore_api/models/outer_enum_integer.py | 10 ++--
 .../outer_enum_integer_default_value.py       | 10 ++--
 .../petstore_api/models/pet.py                | 10 ++--
 .../petstore_api/models/quadrilateral.py      | 12 ++---
 .../models/quadrilateral_interface.py         | 10 ++--
 .../petstore_api/models/read_only_first.py    | 10 ++--
 .../petstore_api/models/scalene_triangle.py   | 12 ++---
 .../petstore_api/models/shape.py              | 12 ++---
 .../petstore_api/models/shape_interface.py    | 10 ++--
 .../petstore_api/models/shape_or_null.py      | 12 ++---
 .../models/simple_quadrilateral.py            | 12 ++---
 .../petstore_api/models/special_model_name.py | 10 ++--
 .../petstore_api/models/string_boolean_map.py | 10 ++--
 .../petstore_api/models/tag.py                | 10 ++--
 .../petstore_api/models/triangle.py           | 12 ++---
 .../petstore_api/models/triangle_interface.py | 10 ++--
 .../petstore_api/models/user.py               | 10 ++--
 .../petstore_api/models/whale.py              | 10 ++--
 .../petstore_api/models/zebra.py              | 10 ++--
 149 files changed, 817 insertions(+), 817 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_init_composed.mustache b/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_init_composed.mustache
index 64328d5e97e7..9bcccce02fe7 100644
--- a/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_init_composed.mustache
+++ b/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_init_composed.mustache
@@ -1,7 +1,7 @@
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -15,7 +15,7 @@
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_json_variable_naming': _json_variable_naming,
+            '_spec_property_naming': spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_init_normal.mustache b/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_init_normal.mustache
index 0994ebbbd801..9a3aeaefeaf8 100644
--- a/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_init_normal.mustache
+++ b/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_init_normal.mustache
@@ -1,7 +1,7 @@
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
diff --git a/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_init_shared.mustache b/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_init_shared.mustache
index fee19ce5195c..3a77f7e8a8d9 100644
--- a/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_init_shared.mustache
+++ b/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_init_shared.mustache
@@ -1,5 +1,5 @@
     @convert_js_args_to_python_args
-    def __init__(self{{#requiredVars}}{{^defaultValue}}, {{name}}{{/defaultValue}}{{/requiredVars}}{{#requiredVars}}{{#defaultValue}}, {{name}}={{{defaultValue}}}{{/defaultValue}}{{/requiredVars}}, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self{{#requiredVars}}{{^defaultValue}}, {{name}}{{/defaultValue}}{{/requiredVars}}{{#requiredVars}}{{#defaultValue}}, {{name}}={{{defaultValue}}}{{/defaultValue}}{{/requiredVars}}, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """{{classname}} - a model defined in OpenAPI
 
 {{#requiredVars}}
@@ -26,8 +26,8 @@
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -56,7 +56,7 @@
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_set_attribute.mustache b/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_set_attribute.mustache
index aed889dbbb6b..8ba0529cd0a6 100644
--- a/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_set_attribute.mustache
+++ b/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_set_attribute.mustache
@@ -33,7 +33,7 @@
 
         if self._check_type:
             value = validate_and_convert_types(
-                value, required_types_mixed, path_to_item, self._json_variable_naming,
+                value, required_types_mixed, path_to_item, self._spec_property_naming,
                 self._check_type, configuration=self._configuration)
         if (name,) in self.allowed_values:
             check_allowed_values(
diff --git a/modules/openapi-generator/src/main/resources/python/python-experimental/model_utils.mustache b/modules/openapi-generator/src/main/resources/python/python-experimental/model_utils.mustache
index 90948ee8bbbb..92fa05d60ffe 100644
--- a/modules/openapi-generator/src/main/resources/python/python-experimental/model_utils.mustache
+++ b/modules/openapi-generator/src/main/resources/python/python-experimental/model_utils.mustache
@@ -563,15 +563,15 @@ def order_response_types(required_types):
     return sorted_types
 
 
-def remove_uncoercible(required_types_classes, current_item, json_variable_naming,
+def remove_uncoercible(required_types_classes, current_item, spec_property_naming,
                        must_convert=True):
     """Only keeps the type conversions that are possible
 
     Args:
         required_types_classes (tuple): tuple of classes that are required
                           these should be ordered by COERCION_INDEX_BY_TYPE
-        json_variable_naming (bool): True if the variable names in the input
-            data are JSON names, i.e. as serialized.
+        spec_property_naming (bool): True if the variable names in the input
+            data are serialized names as specified in the OpenAPI document.
             False if the variables names in the input data are python
             variable names in PEP-8 snake case.
         current_item (any): the current item (input data) to be converted
@@ -603,7 +603,7 @@ def remove_uncoercible(required_types_classes, current_item, json_variable_namin
             continue
 
         class_pair = (current_type_simple, required_type_class_simplified)
-        if must_convert and class_pair in COERCIBLE_TYPE_PAIRS[json_variable_naming]:
+        if must_convert and class_pair in COERCIBLE_TYPE_PAIRS[spec_property_naming]:
             results_classes.append(required_type_class)
         elif class_pair in UPCONVERSION_TYPE_PAIRS:
             results_classes.append(required_type_class)
@@ -787,7 +787,7 @@ def get_discriminator_class(model_class,
 
 
 def deserialize_model(model_data, model_class, path_to_item, check_type,
-                      configuration, json_variable_naming):
+                      configuration, spec_property_naming):
     """Deserializes model_data to model instance.
 
     Args:
@@ -797,8 +797,8 @@ def deserialize_model(model_data, model_class, path_to_item, check_type,
         check_type (bool): whether to check the data tupe for the values in
             the model
         configuration (Configuration): the instance to use to convert files
-        json_variable_naming (bool): True if the variable names in the input
-            data are JSON names, i.e. as serialized.
+        spec_property_naming (bool): True if the variable names in the input
+            data are serialized names as specified in the OpenAPI document.
             False if the variables names in the input data are python
             variable names in PEP-8 snake case.
 
@@ -814,7 +814,7 @@ def deserialize_model(model_data, model_class, path_to_item, check_type,
     kw_args = dict(_check_type=check_type,
                    _path_to_item=path_to_item,
                    _configuration=configuration,
-                   _json_variable_naming=json_variable_naming)
+                   _spec_property_naming=spec_property_naming)
 
     if issubclass(model_class, ModelSimple):
         instance = model_class(value=model_data, **kw_args)
@@ -865,7 +865,7 @@ def deserialize_file(response_data, configuration, content_disposition=None):
 
 
 def attempt_convert_item(input_value, valid_classes, path_to_item,
-                         configuration, json_variable_naming, key_type=False,
+                         configuration, spec_property_naming, key_type=False,
                          must_convert=False, check_type=True):
     """
     Args:
@@ -873,8 +873,8 @@ def attempt_convert_item(input_value, valid_classes, path_to_item,
         valid_classes (any): the classes that are valid
         path_to_item (list): the path to the item to convert
         configuration (Configuration): the instance to use to convert files
-        json_variable_naming (bool): True if the variable names in the input
-            data are JSON names, i.e. as serialized.
+        spec_property_naming (bool): True if the variable names in the input
+            data are serialized names as specified in the OpenAPI document.
             False if the variables names in the input data are python
             variable names in PEP-8 snake case.
         key_type (bool): if True we need to convert a key type (not supported)
@@ -892,7 +892,7 @@ def attempt_convert_item(input_value, valid_classes, path_to_item,
     """
     valid_classes_ordered = order_response_types(valid_classes)
     valid_classes_coercible = remove_uncoercible(
-        valid_classes_ordered, input_value, json_variable_naming)
+        valid_classes_ordered, input_value, spec_property_naming)
     if not valid_classes_coercible or key_type:
         # we do not handle keytype errors, json will take care
         # of this for us
@@ -904,7 +904,7 @@ def attempt_convert_item(input_value, valid_classes, path_to_item,
             if issubclass(valid_class, OpenApiModel):
                 return deserialize_model(input_value, valid_class,
                                          path_to_item, check_type,
-                                         configuration, json_variable_naming)
+                                         configuration, spec_property_naming)
             elif valid_class == file_type:
                 return deserialize_file(input_value, configuration)
             return deserialize_primitive(input_value, valid_class,
@@ -976,7 +976,7 @@ def is_valid_type(input_class_simple, valid_classes):
 
 
 def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
-                               json_variable_naming, _check_type, configuration=None):
+                               spec_property_naming, _check_type, configuration=None):
     """Raises a TypeError is there is a problem, otherwise returns value
 
     Args:
@@ -987,8 +987,8 @@ def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
         path_to_item: (list) the path to the data being validated
             this stores a list of keys or indices to get to the data being
             validated
-        json_variable_naming (bool): True if the variable names in the input
-            data are JSON names, i.e. as serialized.
+        spec_property_naming (bool): True if the variable names in the input
+            data are serialized names as specified in the OpenAPI document.
             False if the variables names in the input data are python
             variable names in PEP-8 snake case.
         _check_type: (boolean) if true, type will be checked and conversion
@@ -1018,7 +1018,7 @@ def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
                 valid_classes,
                 path_to_item,
                 configuration,
-                json_variable_naming,
+                spec_property_naming,
                 key_type=False,
                 must_convert=True
             )
@@ -1031,14 +1031,14 @@ def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
     if len(valid_classes) > 1 and configuration:
         # there are valid classes which are not the current class
         valid_classes_coercible = remove_uncoercible(
-            valid_classes, input_value, json_variable_naming, must_convert=False)
+            valid_classes, input_value, spec_property_naming, must_convert=False)
         if valid_classes_coercible:
             converted_instance = attempt_convert_item(
                 input_value,
                 valid_classes_coercible,
                 path_to_item,
                 configuration,
-                json_variable_naming,
+                spec_property_naming,
                 key_type=False,
                 must_convert=False
             )
@@ -1065,7 +1065,7 @@ def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
                 inner_value,
                 inner_required_types,
                 inner_path,
-                json_variable_naming,
+                spec_property_naming,
                 _check_type,
                 configuration=configuration
             )
@@ -1083,7 +1083,7 @@ def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
                 inner_val,
                 inner_required_types,
                 inner_path,
-                json_variable_naming,
+                spec_property_naming,
                 _check_type,
                 configuration=configuration
             )
@@ -1189,8 +1189,8 @@ def convert_js_args_to_python_args(fn):
     from functools import wraps
     @wraps(fn)
     def wrapped_init(self, *args, **kwargs):
-        json_variable_naming = kwargs.get('_json_variable_naming', False)
-        if json_variable_naming:
+        spec_property_naming = kwargs.get('_spec_property_naming', False)
+        if spec_property_naming:
             kwargs = change_keys_js_to_python(kwargs, self.__class__)
         return fn(self, *args, **kwargs)
     return wrapped_init
diff --git a/samples/client/petstore/python-experimental/petstore_api/model_utils.py b/samples/client/petstore/python-experimental/petstore_api/model_utils.py
index 8e52e7535074..6934b8ae25be 100644
--- a/samples/client/petstore/python-experimental/petstore_api/model_utils.py
+++ b/samples/client/petstore/python-experimental/petstore_api/model_utils.py
@@ -100,7 +100,7 @@ def set_attribute(self, name, value):
 
         if self._check_type:
             value = validate_and_convert_types(
-                value, required_types_mixed, path_to_item, self._json_variable_naming,
+                value, required_types_mixed, path_to_item, self._spec_property_naming,
                 self._check_type, configuration=self._configuration)
         if (name,) in self.allowed_values:
             check_allowed_values(
@@ -830,15 +830,15 @@ def index_getter(class_or_instance):
     return sorted_types
 
 
-def remove_uncoercible(required_types_classes, current_item, json_variable_naming,
+def remove_uncoercible(required_types_classes, current_item, spec_property_naming,
                        must_convert=True):
     """Only keeps the type conversions that are possible
 
     Args:
         required_types_classes (tuple): tuple of classes that are required
                           these should be ordered by COERCION_INDEX_BY_TYPE
-        json_variable_naming (bool): True if the variable names in the input
-            data are JSON names, i.e. as serialized.
+        spec_property_naming (bool): True if the variable names in the input
+            data are serialized names as specified in the OpenAPI document.
             False if the variables names in the input data are python
             variable names in PEP-8 snake case.
         current_item (any): the current item (input data) to be converted
@@ -870,7 +870,7 @@ def remove_uncoercible(required_types_classes, current_item, json_variable_namin
             continue
 
         class_pair = (current_type_simple, required_type_class_simplified)
-        if must_convert and class_pair in COERCIBLE_TYPE_PAIRS[json_variable_naming]:
+        if must_convert and class_pair in COERCIBLE_TYPE_PAIRS[spec_property_naming]:
             results_classes.append(required_type_class)
         elif class_pair in UPCONVERSION_TYPE_PAIRS:
             results_classes.append(required_type_class)
@@ -1054,7 +1054,7 @@ def get_discriminator_class(model_class,
 
 
 def deserialize_model(model_data, model_class, path_to_item, check_type,
-                      configuration, json_variable_naming):
+                      configuration, spec_property_naming):
     """Deserializes model_data to model instance.
 
     Args:
@@ -1064,8 +1064,8 @@ def deserialize_model(model_data, model_class, path_to_item, check_type,
         check_type (bool): whether to check the data tupe for the values in
             the model
         configuration (Configuration): the instance to use to convert files
-        json_variable_naming (bool): True if the variable names in the input
-            data are JSON names, i.e. as serialized.
+        spec_property_naming (bool): True if the variable names in the input
+            data are serialized names as specified in the OpenAPI document.
             False if the variables names in the input data are python
             variable names in PEP-8 snake case.
 
@@ -1081,7 +1081,7 @@ def deserialize_model(model_data, model_class, path_to_item, check_type,
     kw_args = dict(_check_type=check_type,
                    _path_to_item=path_to_item,
                    _configuration=configuration,
-                   _json_variable_naming=json_variable_naming)
+                   _spec_property_naming=spec_property_naming)
 
     if issubclass(model_class, ModelSimple):
         instance = model_class(value=model_data, **kw_args)
@@ -1132,7 +1132,7 @@ def deserialize_file(response_data, configuration, content_disposition=None):
 
 
 def attempt_convert_item(input_value, valid_classes, path_to_item,
-                         configuration, json_variable_naming, key_type=False,
+                         configuration, spec_property_naming, key_type=False,
                          must_convert=False, check_type=True):
     """
     Args:
@@ -1140,8 +1140,8 @@ def attempt_convert_item(input_value, valid_classes, path_to_item,
         valid_classes (any): the classes that are valid
         path_to_item (list): the path to the item to convert
         configuration (Configuration): the instance to use to convert files
-        json_variable_naming (bool): True if the variable names in the input
-            data are JSON names, i.e. as serialized.
+        spec_property_naming (bool): True if the variable names in the input
+            data are serialized names as specified in the OpenAPI document.
             False if the variables names in the input data are python
             variable names in PEP-8 snake case.
         key_type (bool): if True we need to convert a key type (not supported)
@@ -1159,7 +1159,7 @@ def attempt_convert_item(input_value, valid_classes, path_to_item,
     """
     valid_classes_ordered = order_response_types(valid_classes)
     valid_classes_coercible = remove_uncoercible(
-        valid_classes_ordered, input_value, json_variable_naming)
+        valid_classes_ordered, input_value, spec_property_naming)
     if not valid_classes_coercible or key_type:
         # we do not handle keytype errors, json will take care
         # of this for us
@@ -1171,7 +1171,7 @@ def attempt_convert_item(input_value, valid_classes, path_to_item,
             if issubclass(valid_class, OpenApiModel):
                 return deserialize_model(input_value, valid_class,
                                          path_to_item, check_type,
-                                         configuration, json_variable_naming)
+                                         configuration, spec_property_naming)
             elif valid_class == file_type:
                 return deserialize_file(input_value, configuration)
             return deserialize_primitive(input_value, valid_class,
@@ -1243,7 +1243,7 @@ def is_valid_type(input_class_simple, valid_classes):
 
 
 def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
-                               json_variable_naming, _check_type, configuration=None):
+                               spec_property_naming, _check_type, configuration=None):
     """Raises a TypeError is there is a problem, otherwise returns value
 
     Args:
@@ -1254,8 +1254,8 @@ def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
         path_to_item: (list) the path to the data being validated
             this stores a list of keys or indices to get to the data being
             validated
-        json_variable_naming (bool): True if the variable names in the input
-            data are JSON names, i.e. as serialized.
+        spec_property_naming (bool): True if the variable names in the input
+            data are serialized names as specified in the OpenAPI document.
             False if the variables names in the input data are python
             variable names in PEP-8 snake case.
         _check_type: (boolean) if true, type will be checked and conversion
@@ -1285,7 +1285,7 @@ def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
                 valid_classes,
                 path_to_item,
                 configuration,
-                json_variable_naming,
+                spec_property_naming,
                 key_type=False,
                 must_convert=True
             )
@@ -1298,14 +1298,14 @@ def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
     if len(valid_classes) > 1 and configuration:
         # there are valid classes which are not the current class
         valid_classes_coercible = remove_uncoercible(
-            valid_classes, input_value, json_variable_naming, must_convert=False)
+            valid_classes, input_value, spec_property_naming, must_convert=False)
         if valid_classes_coercible:
             converted_instance = attempt_convert_item(
                 input_value,
                 valid_classes_coercible,
                 path_to_item,
                 configuration,
-                json_variable_naming,
+                spec_property_naming,
                 key_type=False,
                 must_convert=False
             )
@@ -1332,7 +1332,7 @@ def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
                 inner_value,
                 inner_required_types,
                 inner_path,
-                json_variable_naming,
+                spec_property_naming,
                 _check_type,
                 configuration=configuration
             )
@@ -1350,7 +1350,7 @@ def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
                 inner_val,
                 inner_required_types,
                 inner_path,
-                json_variable_naming,
+                spec_property_naming,
                 _check_type,
                 configuration=configuration
             )
@@ -1456,8 +1456,8 @@ def convert_js_args_to_python_args(fn):
     from functools import wraps
     @wraps(fn)
     def wrapped_init(self, *args, **kwargs):
-        json_variable_naming = kwargs.get('_json_variable_naming', False)
-        if json_variable_naming:
+        spec_property_naming = kwargs.get('_spec_property_naming', False)
+        if spec_property_naming:
             kwargs = change_keys_js_to_python(kwargs, self.__class__)
         return fn(self, *args, **kwargs)
     return wrapped_init
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_any_type.py b/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_any_type.py
index 52c18bfc2da6..4475d61d6f20 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_any_type.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_any_type.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """additional_properties_any_type.AdditionalPropertiesAnyType - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_array.py b/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_array.py
index 67f55c702fdc..4a0da3ef8bc7 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_array.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_array.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """additional_properties_array.AdditionalPropertiesArray - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_boolean.py b/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_boolean.py
index 131fd89d8a13..93b052b54c12 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_boolean.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_boolean.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """additional_properties_boolean.AdditionalPropertiesBoolean - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_class.py b/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_class.py
index 28892a54b3cd..6064f3ffd09d 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_class.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_class.py
@@ -113,14 +113,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """additional_properties_class.AdditionalPropertiesClass - a model defined in OpenAPI
 
         Keyword Args:
@@ -131,8 +131,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -169,7 +169,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_integer.py b/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_integer.py
index 0debd51b1eee..e58c456a32fd 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_integer.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_integer.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """additional_properties_integer.AdditionalPropertiesInteger - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_number.py b/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_number.py
index d9e712e9aa5f..bda68b941684 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_number.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_number.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """additional_properties_number.AdditionalPropertiesNumber - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_object.py b/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_object.py
index 2c2b1faa967c..49e2428be06f 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_object.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_object.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """additional_properties_object.AdditionalPropertiesObject - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_string.py b/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_string.py
index c4aed6c7ac13..8f1b0c0857e5 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_string.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/additional_properties_string.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """additional_properties_string.AdditionalPropertiesString - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/animal.py b/samples/client/petstore/python-experimental/petstore_api/models/animal.py
index 73a4f0a888c2..7e4a748fdc33 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/animal.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/animal.py
@@ -111,14 +111,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, class_name, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """animal.Animal - a model defined in OpenAPI
 
         Args:
@@ -132,8 +132,8 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -160,7 +160,7 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/api_response.py b/samples/client/petstore/python-experimental/petstore_api/models/api_response.py
index db516ae58749..3b49eaca1d24 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/api_response.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/api_response.py
@@ -97,14 +97,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """api_response.ApiResponse - a model defined in OpenAPI
 
         Keyword Args:
@@ -115,8 +115,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -145,7 +145,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/array_of_array_of_number_only.py b/samples/client/petstore/python-experimental/petstore_api/models/array_of_array_of_number_only.py
index 2c87c8aaec5f..298cfdebb363 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/array_of_array_of_number_only.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/array_of_array_of_number_only.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """array_of_array_of_number_only.ArrayOfArrayOfNumberOnly - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/array_of_number_only.py b/samples/client/petstore/python-experimental/petstore_api/models/array_of_number_only.py
index cebf5408970f..756bb0f5fb9a 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/array_of_number_only.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/array_of_number_only.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """array_of_number_only.ArrayOfNumberOnly - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/array_test.py b/samples/client/petstore/python-experimental/petstore_api/models/array_test.py
index 47163960895d..25396bbcf211 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/array_test.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/array_test.py
@@ -102,14 +102,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """array_test.ArrayTest - a model defined in OpenAPI
 
         Keyword Args:
@@ -120,8 +120,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -150,7 +150,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/capitalization.py b/samples/client/petstore/python-experimental/petstore_api/models/capitalization.py
index 3086efab3e3b..2f519f66bb8b 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/capitalization.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/capitalization.py
@@ -103,14 +103,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """capitalization.Capitalization - a model defined in OpenAPI
 
         Keyword Args:
@@ -121,8 +121,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -154,7 +154,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/cat.py b/samples/client/petstore/python-experimental/petstore_api/models/cat.py
index 3e35195e8473..103ff8cfe678 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/cat.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/cat.py
@@ -109,7 +109,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -119,7 +119,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, class_name, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """cat.Cat - a model defined in OpenAPI
 
         Args:
@@ -133,8 +133,8 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -162,7 +162,7 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -170,7 +170,7 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_json_variable_naming': _json_variable_naming,
+            '_spec_property_naming': spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/cat_all_of.py b/samples/client/petstore/python-experimental/petstore_api/models/cat_all_of.py
index d7f02a59b6b8..855371673ac3 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/cat_all_of.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/cat_all_of.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """cat_all_of.CatAllOf - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/category.py b/samples/client/petstore/python-experimental/petstore_api/models/category.py
index f39116c983c4..35eb224e17aa 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/category.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/category.py
@@ -95,14 +95,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, name='default-name', _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, name='default-name', _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """category.Category - a model defined in OpenAPI
 
         Args:
@@ -116,8 +116,8 @@ def __init__(self, name='default-name', _check_type=True, _json_variable_naming=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -144,7 +144,7 @@ def __init__(self, name='default-name', _check_type=True, _json_variable_naming=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/child.py b/samples/client/petstore/python-experimental/petstore_api/models/child.py
index 1bbb35ebd150..1fb269fbe95f 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/child.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/child.py
@@ -105,7 +105,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -115,7 +115,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """child.Child - a model defined in OpenAPI
 
         Keyword Args:
@@ -126,8 +126,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -156,7 +156,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -164,7 +164,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_json_variable_naming': _json_variable_naming,
+            '_spec_property_naming': spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/child_all_of.py b/samples/client/petstore/python-experimental/petstore_api/models/child_all_of.py
index d8eca3a1fc41..96f0ecc7705a 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/child_all_of.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/child_all_of.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """child_all_of.ChildAllOf - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/child_cat.py b/samples/client/petstore/python-experimental/petstore_api/models/child_cat.py
index 1d0e521e34db..ae4edc0d2ddf 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/child_cat.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/child_cat.py
@@ -107,7 +107,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -117,7 +117,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, pet_type, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, pet_type, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """child_cat.ChildCat - a model defined in OpenAPI
 
         Args:
@@ -131,8 +131,8 @@ def __init__(self, pet_type, _check_type=True, _json_variable_naming=False, _pat
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -159,7 +159,7 @@ def __init__(self, pet_type, _check_type=True, _json_variable_naming=False, _pat
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -167,7 +167,7 @@ def __init__(self, pet_type, _check_type=True, _json_variable_naming=False, _pat
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_json_variable_naming': _json_variable_naming,
+            '_spec_property_naming': spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/child_cat_all_of.py b/samples/client/petstore/python-experimental/petstore_api/models/child_cat_all_of.py
index c59230a7d3de..f159c32fd86d 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/child_cat_all_of.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/child_cat_all_of.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """child_cat_all_of.ChildCatAllOf - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/child_dog.py b/samples/client/petstore/python-experimental/petstore_api/models/child_dog.py
index 14303c504464..fcb49d9e2eea 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/child_dog.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/child_dog.py
@@ -107,7 +107,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -117,7 +117,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, pet_type, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, pet_type, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """child_dog.ChildDog - a model defined in OpenAPI
 
         Args:
@@ -131,8 +131,8 @@ def __init__(self, pet_type, _check_type=True, _json_variable_naming=False, _pat
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -159,7 +159,7 @@ def __init__(self, pet_type, _check_type=True, _json_variable_naming=False, _pat
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -167,7 +167,7 @@ def __init__(self, pet_type, _check_type=True, _json_variable_naming=False, _pat
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_json_variable_naming': _json_variable_naming,
+            '_spec_property_naming': spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/child_dog_all_of.py b/samples/client/petstore/python-experimental/petstore_api/models/child_dog_all_of.py
index 63c946d11caa..b7d46f365ead 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/child_dog_all_of.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/child_dog_all_of.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """child_dog_all_of.ChildDogAllOf - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/child_lizard.py b/samples/client/petstore/python-experimental/petstore_api/models/child_lizard.py
index ab448d1a408b..fb351da52959 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/child_lizard.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/child_lizard.py
@@ -107,7 +107,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -117,7 +117,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, pet_type, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, pet_type, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """child_lizard.ChildLizard - a model defined in OpenAPI
 
         Args:
@@ -131,8 +131,8 @@ def __init__(self, pet_type, _check_type=True, _json_variable_naming=False, _pat
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -159,7 +159,7 @@ def __init__(self, pet_type, _check_type=True, _json_variable_naming=False, _pat
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -167,7 +167,7 @@ def __init__(self, pet_type, _check_type=True, _json_variable_naming=False, _pat
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_json_variable_naming': _json_variable_naming,
+            '_spec_property_naming': spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/child_lizard_all_of.py b/samples/client/petstore/python-experimental/petstore_api/models/child_lizard_all_of.py
index 7d9d18ddc8c3..949343e858ed 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/child_lizard_all_of.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/child_lizard_all_of.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """child_lizard_all_of.ChildLizardAllOf - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/class_model.py b/samples/client/petstore/python-experimental/petstore_api/models/class_model.py
index 5db2e1af5547..6244421e6014 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/class_model.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/class_model.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """class_model.ClassModel - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/client.py b/samples/client/petstore/python-experimental/petstore_api/models/client.py
index bd5ce5ade76c..f5c6854bbaeb 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/client.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/client.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """client.Client - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/dog.py b/samples/client/petstore/python-experimental/petstore_api/models/dog.py
index 3f55b0a81a40..4477c9b7394c 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/dog.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/dog.py
@@ -109,7 +109,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -119,7 +119,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, class_name, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """dog.Dog - a model defined in OpenAPI
 
         Args:
@@ -133,8 +133,8 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -162,7 +162,7 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -170,7 +170,7 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_json_variable_naming': _json_variable_naming,
+            '_spec_property_naming': spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/dog_all_of.py b/samples/client/petstore/python-experimental/petstore_api/models/dog_all_of.py
index 33b5478fc206..fe4e3ebe28d2 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/dog_all_of.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/dog_all_of.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """dog_all_of.DogAllOf - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/enum_arrays.py b/samples/client/petstore/python-experimental/petstore_api/models/enum_arrays.py
index f2d46eb36037..fd06d3eb3849 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/enum_arrays.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/enum_arrays.py
@@ -103,14 +103,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """enum_arrays.EnumArrays - a model defined in OpenAPI
 
         Keyword Args:
@@ -121,8 +121,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -150,7 +150,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/enum_class.py b/samples/client/petstore/python-experimental/petstore_api/models/enum_class.py
index 9185052ee078..6e59d0162be2 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/enum_class.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/enum_class.py
@@ -90,14 +90,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, value='-efg', _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, value='-efg', _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """enum_class.EnumClass - a model defined in OpenAPI
 
         Args:
@@ -111,8 +111,8 @@ def __init__(self, value='-efg', _check_type=True, _json_variable_naming=False,
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -138,7 +138,7 @@ def __init__(self, value='-efg', _check_type=True, _json_variable_naming=False,
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/enum_test.py b/samples/client/petstore/python-experimental/petstore_api/models/enum_test.py
index 3dfe0732b296..cfbcf63229ac 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/enum_test.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/enum_test.py
@@ -124,14 +124,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, enum_string_required, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, enum_string_required, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """enum_test.EnumTest - a model defined in OpenAPI
 
         Args:
@@ -145,8 +145,8 @@ def __init__(self, enum_string_required, _check_type=True, _json_variable_naming
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -176,7 +176,7 @@ def __init__(self, enum_string_required, _check_type=True, _json_variable_naming
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/file.py b/samples/client/petstore/python-experimental/petstore_api/models/file.py
index e250c79fda4e..873052db9ace 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/file.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/file.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """file.File - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/file_schema_test_class.py b/samples/client/petstore/python-experimental/petstore_api/models/file_schema_test_class.py
index 874969d8a892..32dd82773dd7 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/file_schema_test_class.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/file_schema_test_class.py
@@ -100,14 +100,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """file_schema_test_class.FileSchemaTestClass - a model defined in OpenAPI
 
         Keyword Args:
@@ -118,8 +118,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -147,7 +147,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/format_test.py b/samples/client/petstore/python-experimental/petstore_api/models/format_test.py
index 7192ffee4cc1..d69c311f3169 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/format_test.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/format_test.py
@@ -152,14 +152,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, number, byte, date, password, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, number, byte, date, password, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """format_test.FormatTest - a model defined in OpenAPI
 
         Args:
@@ -176,8 +176,8 @@ def __init__(self, number, byte, date, password, _check_type=True, _json_variabl
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -212,7 +212,7 @@ def __init__(self, number, byte, date, password, _check_type=True, _json_variabl
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/grandparent.py b/samples/client/petstore/python-experimental/petstore_api/models/grandparent.py
index 149de9dfc91c..8949eed490e3 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/grandparent.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/grandparent.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """grandparent.Grandparent - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/grandparent_animal.py b/samples/client/petstore/python-experimental/petstore_api/models/grandparent_animal.py
index a60ae8ead74f..bf6396bb859e 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/grandparent_animal.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/grandparent_animal.py
@@ -121,14 +121,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, pet_type, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, pet_type, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """grandparent_animal.GrandparentAnimal - a model defined in OpenAPI
 
         Args:
@@ -142,8 +142,8 @@ def __init__(self, pet_type, _check_type=True, _json_variable_naming=False, _pat
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -169,7 +169,7 @@ def __init__(self, pet_type, _check_type=True, _json_variable_naming=False, _pat
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/has_only_read_only.py b/samples/client/petstore/python-experimental/petstore_api/models/has_only_read_only.py
index 22623afe8169..a80d49539b38 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/has_only_read_only.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/has_only_read_only.py
@@ -95,14 +95,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """has_only_read_only.HasOnlyReadOnly - a model defined in OpenAPI
 
         Keyword Args:
@@ -113,8 +113,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -142,7 +142,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/list.py b/samples/client/petstore/python-experimental/petstore_api/models/list.py
index 772d64c877bd..93acc4dd8de1 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/list.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/list.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """list.List - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/map_test.py b/samples/client/petstore/python-experimental/petstore_api/models/map_test.py
index 487e2a3793f5..1d58629e43bb 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/map_test.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/map_test.py
@@ -108,14 +108,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """map_test.MapTest - a model defined in OpenAPI
 
         Keyword Args:
@@ -126,8 +126,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -157,7 +157,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/mixed_properties_and_additional_properties_class.py b/samples/client/petstore/python-experimental/petstore_api/models/mixed_properties_and_additional_properties_class.py
index 42a9b15b86fb..bbae3d50a071 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/mixed_properties_and_additional_properties_class.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/mixed_properties_and_additional_properties_class.py
@@ -102,14 +102,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """mixed_properties_and_additional_properties_class.MixedPropertiesAndAdditionalPropertiesClass - a model defined in OpenAPI
 
         Keyword Args:
@@ -120,8 +120,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -150,7 +150,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/model200_response.py b/samples/client/petstore/python-experimental/petstore_api/models/model200_response.py
index bc00b7694177..bbbe72bd1ceb 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/model200_response.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/model200_response.py
@@ -95,14 +95,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """model200_response.Model200Response - a model defined in OpenAPI
 
         Keyword Args:
@@ -113,8 +113,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -142,7 +142,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/model_return.py b/samples/client/petstore/python-experimental/petstore_api/models/model_return.py
index 76f4315edc86..80a187b13fbc 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/model_return.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/model_return.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """model_return.ModelReturn - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/name.py b/samples/client/petstore/python-experimental/petstore_api/models/name.py
index fc7922375034..96d4ffd69f87 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/name.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/name.py
@@ -99,14 +99,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, name, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, name, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """name.Name - a model defined in OpenAPI
 
         Args:
@@ -120,8 +120,8 @@ def __init__(self, name, _check_type=True, _json_variable_naming=False, _path_to
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -150,7 +150,7 @@ def __init__(self, name, _check_type=True, _json_variable_naming=False, _path_to
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/number_only.py b/samples/client/petstore/python-experimental/petstore_api/models/number_only.py
index ca0e364039f4..5e84c5a16f40 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/number_only.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/number_only.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """number_only.NumberOnly - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/order.py b/samples/client/petstore/python-experimental/petstore_api/models/order.py
index d43a0b84de2e..535fe7cd9962 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/order.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/order.py
@@ -108,14 +108,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """order.Order - a model defined in OpenAPI
 
         Keyword Args:
@@ -126,8 +126,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -159,7 +159,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/outer_composite.py b/samples/client/petstore/python-experimental/petstore_api/models/outer_composite.py
index 2b81526a0a3b..b5c41308122e 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/outer_composite.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/outer_composite.py
@@ -102,14 +102,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """outer_composite.OuterComposite - a model defined in OpenAPI
 
         Keyword Args:
@@ -120,8 +120,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -150,7 +150,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/outer_enum.py b/samples/client/petstore/python-experimental/petstore_api/models/outer_enum.py
index 1e761e87f8df..8a30abf9a216 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/outer_enum.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/outer_enum.py
@@ -90,14 +90,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, value, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, value, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """outer_enum.OuterEnum - a model defined in OpenAPI
 
         Args:
@@ -111,8 +111,8 @@ def __init__(self, value, _check_type=True, _json_variable_naming=False, _path_t
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -138,7 +138,7 @@ def __init__(self, value, _check_type=True, _json_variable_naming=False, _path_t
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/outer_number.py b/samples/client/petstore/python-experimental/petstore_api/models/outer_number.py
index 4ed0a0b0b5ea..5633050812e5 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/outer_number.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/outer_number.py
@@ -89,14 +89,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, value, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, value, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """outer_number.OuterNumber - a model defined in OpenAPI
 
         Args:
@@ -110,8 +110,8 @@ def __init__(self, value, _check_type=True, _json_variable_naming=False, _path_t
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -137,7 +137,7 @@ def __init__(self, value, _check_type=True, _json_variable_naming=False, _path_t
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/parent.py b/samples/client/petstore/python-experimental/petstore_api/models/parent.py
index 8d3275851b7b..36e6c4151391 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/parent.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/parent.py
@@ -103,7 +103,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -113,7 +113,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """parent.Parent - a model defined in OpenAPI
 
         Keyword Args:
@@ -124,8 +124,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -153,7 +153,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -161,7 +161,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_json_variable_naming': _json_variable_naming,
+            '_spec_property_naming': spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/parent_all_of.py b/samples/client/petstore/python-experimental/petstore_api/models/parent_all_of.py
index d8b2e17e02f2..d65ad906ef52 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/parent_all_of.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/parent_all_of.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """parent_all_of.ParentAllOf - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/parent_pet.py b/samples/client/petstore/python-experimental/petstore_api/models/parent_pet.py
index 0bed372a7464..e8e3d49f379a 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/parent_pet.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/parent_pet.py
@@ -118,7 +118,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -128,7 +128,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, pet_type, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, pet_type, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """parent_pet.ParentPet - a model defined in OpenAPI
 
         Args:
@@ -142,8 +142,8 @@ def __init__(self, pet_type, _check_type=True, _json_variable_naming=False, _pat
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -169,7 +169,7 @@ def __init__(self, pet_type, _check_type=True, _json_variable_naming=False, _pat
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -177,7 +177,7 @@ def __init__(self, pet_type, _check_type=True, _json_variable_naming=False, _pat
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_json_variable_naming': _json_variable_naming,
+            '_spec_property_naming': spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/pet.py b/samples/client/petstore/python-experimental/petstore_api/models/pet.py
index 6f442d55ba60..7ca5ab6d2240 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/pet.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/pet.py
@@ -118,14 +118,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, name, photo_urls, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, name, photo_urls, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """pet.Pet - a model defined in OpenAPI
 
         Args:
@@ -140,8 +140,8 @@ def __init__(self, name, photo_urls, _check_type=True, _json_variable_naming=Fal
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -171,7 +171,7 @@ def __init__(self, name, photo_urls, _check_type=True, _json_variable_naming=Fal
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/player.py b/samples/client/petstore/python-experimental/petstore_api/models/player.py
index 4b181f33309a..97031d2b9d7a 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/player.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/player.py
@@ -95,14 +95,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, name, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, name, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """player.Player - a model defined in OpenAPI
 
         Args:
@@ -116,8 +116,8 @@ def __init__(self, name, _check_type=True, _json_variable_naming=False, _path_to
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -144,7 +144,7 @@ def __init__(self, name, _check_type=True, _json_variable_naming=False, _path_to
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/read_only_first.py b/samples/client/petstore/python-experimental/petstore_api/models/read_only_first.py
index 5968c992a38c..d5f4f1bfba44 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/read_only_first.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/read_only_first.py
@@ -95,14 +95,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """read_only_first.ReadOnlyFirst - a model defined in OpenAPI
 
         Keyword Args:
@@ -113,8 +113,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -142,7 +142,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/special_model_name.py b/samples/client/petstore/python-experimental/petstore_api/models/special_model_name.py
index 42e4dd0dfe39..0f168298d2a2 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/special_model_name.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/special_model_name.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """special_model_name.SpecialModelName - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/string_boolean_map.py b/samples/client/petstore/python-experimental/petstore_api/models/string_boolean_map.py
index 3c117269fd32..ba0938507be9 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/string_boolean_map.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/string_boolean_map.py
@@ -91,14 +91,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """string_boolean_map.StringBooleanMap - a model defined in OpenAPI
 
         Keyword Args:
@@ -109,8 +109,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -136,7 +136,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/tag.py b/samples/client/petstore/python-experimental/petstore_api/models/tag.py
index 6e433fe52c06..9580c1e1f9d5 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/tag.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/tag.py
@@ -97,14 +97,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """tag.Tag - a model defined in OpenAPI
 
         Keyword Args:
@@ -115,8 +115,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -145,7 +145,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/type_holder_default.py b/samples/client/petstore/python-experimental/petstore_api/models/type_holder_default.py
index 1114be589815..3f9c2da12fce 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/type_holder_default.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/type_holder_default.py
@@ -105,14 +105,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, array_item, string_item='what', number_item=1.234, integer_item=-2, bool_item=True, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, array_item, string_item='what', number_item=1.234, integer_item=-2, bool_item=True, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """type_holder_default.TypeHolderDefault - a model defined in OpenAPI
 
         Args:
@@ -130,8 +130,8 @@ def __init__(self, array_item, string_item='what', number_item=1.234, integer_it
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -159,7 +159,7 @@ def __init__(self, array_item, string_item='what', number_item=1.234, integer_it
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/type_holder_example.py b/samples/client/petstore/python-experimental/petstore_api/models/type_holder_example.py
index 8584b6f85a5c..fea5ee3378db 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/type_holder_example.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/type_holder_example.py
@@ -110,14 +110,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, bool_item, array_item, string_item='what', number_item=1.234, integer_item=-2, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, bool_item, array_item, string_item='what', number_item=1.234, integer_item=-2, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """type_holder_example.TypeHolderExample - a model defined in OpenAPI
 
         Args:
@@ -135,8 +135,8 @@ def __init__(self, bool_item, array_item, string_item='what', number_item=1.234,
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -162,7 +162,7 @@ def __init__(self, bool_item, array_item, string_item='what', number_item=1.234,
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/user.py b/samples/client/petstore/python-experimental/petstore_api/models/user.py
index 27db6056303d..dc92564ae1d6 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/user.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/user.py
@@ -107,14 +107,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """user.User - a model defined in OpenAPI
 
         Keyword Args:
@@ -125,8 +125,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -160,7 +160,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/xml_item.py b/samples/client/petstore/python-experimental/petstore_api/models/xml_item.py
index 05ca9b3cc5f8..71529af241fb 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/xml_item.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/xml_item.py
@@ -149,14 +149,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """xml_item.XmlItem - a model defined in OpenAPI
 
         Keyword Args:
@@ -167,8 +167,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -223,7 +223,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model_utils.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model_utils.py
index 8e52e7535074..6934b8ae25be 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model_utils.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model_utils.py
@@ -100,7 +100,7 @@ def set_attribute(self, name, value):
 
         if self._check_type:
             value = validate_and_convert_types(
-                value, required_types_mixed, path_to_item, self._json_variable_naming,
+                value, required_types_mixed, path_to_item, self._spec_property_naming,
                 self._check_type, configuration=self._configuration)
         if (name,) in self.allowed_values:
             check_allowed_values(
@@ -830,15 +830,15 @@ def index_getter(class_or_instance):
     return sorted_types
 
 
-def remove_uncoercible(required_types_classes, current_item, json_variable_naming,
+def remove_uncoercible(required_types_classes, current_item, spec_property_naming,
                        must_convert=True):
     """Only keeps the type conversions that are possible
 
     Args:
         required_types_classes (tuple): tuple of classes that are required
                           these should be ordered by COERCION_INDEX_BY_TYPE
-        json_variable_naming (bool): True if the variable names in the input
-            data are JSON names, i.e. as serialized.
+        spec_property_naming (bool): True if the variable names in the input
+            data are serialized names as specified in the OpenAPI document.
             False if the variables names in the input data are python
             variable names in PEP-8 snake case.
         current_item (any): the current item (input data) to be converted
@@ -870,7 +870,7 @@ def remove_uncoercible(required_types_classes, current_item, json_variable_namin
             continue
 
         class_pair = (current_type_simple, required_type_class_simplified)
-        if must_convert and class_pair in COERCIBLE_TYPE_PAIRS[json_variable_naming]:
+        if must_convert and class_pair in COERCIBLE_TYPE_PAIRS[spec_property_naming]:
             results_classes.append(required_type_class)
         elif class_pair in UPCONVERSION_TYPE_PAIRS:
             results_classes.append(required_type_class)
@@ -1054,7 +1054,7 @@ def get_discriminator_class(model_class,
 
 
 def deserialize_model(model_data, model_class, path_to_item, check_type,
-                      configuration, json_variable_naming):
+                      configuration, spec_property_naming):
     """Deserializes model_data to model instance.
 
     Args:
@@ -1064,8 +1064,8 @@ def deserialize_model(model_data, model_class, path_to_item, check_type,
         check_type (bool): whether to check the data tupe for the values in
             the model
         configuration (Configuration): the instance to use to convert files
-        json_variable_naming (bool): True if the variable names in the input
-            data are JSON names, i.e. as serialized.
+        spec_property_naming (bool): True if the variable names in the input
+            data are serialized names as specified in the OpenAPI document.
             False if the variables names in the input data are python
             variable names in PEP-8 snake case.
 
@@ -1081,7 +1081,7 @@ def deserialize_model(model_data, model_class, path_to_item, check_type,
     kw_args = dict(_check_type=check_type,
                    _path_to_item=path_to_item,
                    _configuration=configuration,
-                   _json_variable_naming=json_variable_naming)
+                   _spec_property_naming=spec_property_naming)
 
     if issubclass(model_class, ModelSimple):
         instance = model_class(value=model_data, **kw_args)
@@ -1132,7 +1132,7 @@ def deserialize_file(response_data, configuration, content_disposition=None):
 
 
 def attempt_convert_item(input_value, valid_classes, path_to_item,
-                         configuration, json_variable_naming, key_type=False,
+                         configuration, spec_property_naming, key_type=False,
                          must_convert=False, check_type=True):
     """
     Args:
@@ -1140,8 +1140,8 @@ def attempt_convert_item(input_value, valid_classes, path_to_item,
         valid_classes (any): the classes that are valid
         path_to_item (list): the path to the item to convert
         configuration (Configuration): the instance to use to convert files
-        json_variable_naming (bool): True if the variable names in the input
-            data are JSON names, i.e. as serialized.
+        spec_property_naming (bool): True if the variable names in the input
+            data are serialized names as specified in the OpenAPI document.
             False if the variables names in the input data are python
             variable names in PEP-8 snake case.
         key_type (bool): if True we need to convert a key type (not supported)
@@ -1159,7 +1159,7 @@ def attempt_convert_item(input_value, valid_classes, path_to_item,
     """
     valid_classes_ordered = order_response_types(valid_classes)
     valid_classes_coercible = remove_uncoercible(
-        valid_classes_ordered, input_value, json_variable_naming)
+        valid_classes_ordered, input_value, spec_property_naming)
     if not valid_classes_coercible or key_type:
         # we do not handle keytype errors, json will take care
         # of this for us
@@ -1171,7 +1171,7 @@ def attempt_convert_item(input_value, valid_classes, path_to_item,
             if issubclass(valid_class, OpenApiModel):
                 return deserialize_model(input_value, valid_class,
                                          path_to_item, check_type,
-                                         configuration, json_variable_naming)
+                                         configuration, spec_property_naming)
             elif valid_class == file_type:
                 return deserialize_file(input_value, configuration)
             return deserialize_primitive(input_value, valid_class,
@@ -1243,7 +1243,7 @@ def is_valid_type(input_class_simple, valid_classes):
 
 
 def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
-                               json_variable_naming, _check_type, configuration=None):
+                               spec_property_naming, _check_type, configuration=None):
     """Raises a TypeError is there is a problem, otherwise returns value
 
     Args:
@@ -1254,8 +1254,8 @@ def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
         path_to_item: (list) the path to the data being validated
             this stores a list of keys or indices to get to the data being
             validated
-        json_variable_naming (bool): True if the variable names in the input
-            data are JSON names, i.e. as serialized.
+        spec_property_naming (bool): True if the variable names in the input
+            data are serialized names as specified in the OpenAPI document.
             False if the variables names in the input data are python
             variable names in PEP-8 snake case.
         _check_type: (boolean) if true, type will be checked and conversion
@@ -1285,7 +1285,7 @@ def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
                 valid_classes,
                 path_to_item,
                 configuration,
-                json_variable_naming,
+                spec_property_naming,
                 key_type=False,
                 must_convert=True
             )
@@ -1298,14 +1298,14 @@ def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
     if len(valid_classes) > 1 and configuration:
         # there are valid classes which are not the current class
         valid_classes_coercible = remove_uncoercible(
-            valid_classes, input_value, json_variable_naming, must_convert=False)
+            valid_classes, input_value, spec_property_naming, must_convert=False)
         if valid_classes_coercible:
             converted_instance = attempt_convert_item(
                 input_value,
                 valid_classes_coercible,
                 path_to_item,
                 configuration,
-                json_variable_naming,
+                spec_property_naming,
                 key_type=False,
                 must_convert=False
             )
@@ -1332,7 +1332,7 @@ def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
                 inner_value,
                 inner_required_types,
                 inner_path,
-                json_variable_naming,
+                spec_property_naming,
                 _check_type,
                 configuration=configuration
             )
@@ -1350,7 +1350,7 @@ def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
                 inner_val,
                 inner_required_types,
                 inner_path,
-                json_variable_naming,
+                spec_property_naming,
                 _check_type,
                 configuration=configuration
             )
@@ -1456,8 +1456,8 @@ def convert_js_args_to_python_args(fn):
     from functools import wraps
     @wraps(fn)
     def wrapped_init(self, *args, **kwargs):
-        json_variable_naming = kwargs.get('_json_variable_naming', False)
-        if json_variable_naming:
+        spec_property_naming = kwargs.get('_spec_property_naming', False)
+        if spec_property_naming:
             kwargs = change_keys_js_to_python(kwargs, self.__class__)
         return fn(self, *args, **kwargs)
     return wrapped_init
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/additional_properties_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/additional_properties_class.py
index 3a35c878ccb0..929cb4509f09 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/additional_properties_class.py
@@ -95,14 +95,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """additional_properties_class.AdditionalPropertiesClass - a model defined in OpenAPI
 
         Keyword Args:
@@ -113,8 +113,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -142,7 +142,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/address.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/address.py
index dc3481900502..5ce4676becc6 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/address.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/address.py
@@ -91,14 +91,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """address.Address - a model defined in OpenAPI
 
         Keyword Args:
@@ -109,8 +109,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -136,7 +136,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/animal.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/animal.py
index 73a4f0a888c2..7e4a748fdc33 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/animal.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/animal.py
@@ -111,14 +111,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, class_name, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """animal.Animal - a model defined in OpenAPI
 
         Args:
@@ -132,8 +132,8 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -160,7 +160,7 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/api_response.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/api_response.py
index db516ae58749..3b49eaca1d24 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/api_response.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/api_response.py
@@ -97,14 +97,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """api_response.ApiResponse - a model defined in OpenAPI
 
         Keyword Args:
@@ -115,8 +115,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -145,7 +145,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/apple.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/apple.py
index aea0f65306e1..cbef6521e745 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/apple.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/apple.py
@@ -106,14 +106,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """apple.Apple - a model defined in OpenAPI
 
         Keyword Args:
@@ -124,8 +124,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -153,7 +153,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/apple_req.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/apple_req.py
index eba422d34658..beadb0b8e3a5 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/apple_req.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/apple_req.py
@@ -95,14 +95,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, cultivar, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, cultivar, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """apple_req.AppleReq - a model defined in OpenAPI
 
         Args:
@@ -116,8 +116,8 @@ def __init__(self, cultivar, _check_type=True, _json_variable_naming=False, _pat
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -144,7 +144,7 @@ def __init__(self, cultivar, _check_type=True, _json_variable_naming=False, _pat
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/array_of_array_of_number_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/array_of_array_of_number_only.py
index 2c87c8aaec5f..298cfdebb363 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/array_of_array_of_number_only.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/array_of_array_of_number_only.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """array_of_array_of_number_only.ArrayOfArrayOfNumberOnly - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/array_of_number_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/array_of_number_only.py
index cebf5408970f..756bb0f5fb9a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/array_of_number_only.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/array_of_number_only.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """array_of_number_only.ArrayOfNumberOnly - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/array_test.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/array_test.py
index 47163960895d..25396bbcf211 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/array_test.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/array_test.py
@@ -102,14 +102,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """array_test.ArrayTest - a model defined in OpenAPI
 
         Keyword Args:
@@ -120,8 +120,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -150,7 +150,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/banana.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/banana.py
index 5446c3773c07..073f73974fff 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/banana.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/banana.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """banana.Banana - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/banana_req.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/banana_req.py
index 0aa89d4e1e61..4ba2c3d73c85 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/banana_req.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/banana_req.py
@@ -95,14 +95,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, length_cm, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, length_cm, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """banana_req.BananaReq - a model defined in OpenAPI
 
         Args:
@@ -116,8 +116,8 @@ def __init__(self, length_cm, _check_type=True, _json_variable_naming=False, _pa
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -144,7 +144,7 @@ def __init__(self, length_cm, _check_type=True, _json_variable_naming=False, _pa
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_chordate.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_chordate.py
index bde0a8252920..3492f4bd3e79 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_chordate.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_chordate.py
@@ -121,14 +121,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, class_name, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """biology_chordate.BiologyChordate - a model defined in OpenAPI
 
         Args:
@@ -142,8 +142,8 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -169,7 +169,7 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_hominid.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_hominid.py
index b03e566708ce..9994e4b2fff5 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_hominid.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_hominid.py
@@ -100,7 +100,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -110,7 +110,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, class_name, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """biology_hominid.BiologyHominid - a model defined in OpenAPI
 
         Args:
@@ -124,8 +124,8 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -151,7 +151,7 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -159,7 +159,7 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_json_variable_naming': _json_variable_naming,
+            '_spec_property_naming': spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_mammal.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_mammal.py
index 3eba39dea858..2d64f27bde93 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_mammal.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_mammal.py
@@ -112,7 +112,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -122,7 +122,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, class_name, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """biology_mammal.BiologyMammal - a model defined in OpenAPI
 
         Args:
@@ -136,8 +136,8 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -163,7 +163,7 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -171,7 +171,7 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_json_variable_naming': _json_variable_naming,
+            '_spec_property_naming': spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_primate.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_primate.py
index bb11fd7106ae..5c110ab85399 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_primate.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_primate.py
@@ -106,7 +106,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -116,7 +116,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, class_name, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """biology_primate.BiologyPrimate - a model defined in OpenAPI
 
         Args:
@@ -130,8 +130,8 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -157,7 +157,7 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -165,7 +165,7 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_json_variable_naming': _json_variable_naming,
+            '_spec_property_naming': spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_reptile.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_reptile.py
index e9157ee3d482..faf0b637dc1b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_reptile.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_reptile.py
@@ -100,7 +100,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -110,7 +110,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, class_name, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """biology_reptile.BiologyReptile - a model defined in OpenAPI
 
         Args:
@@ -124,8 +124,8 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -151,7 +151,7 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -159,7 +159,7 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_json_variable_naming': _json_variable_naming,
+            '_spec_property_naming': spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/capitalization.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/capitalization.py
index 3086efab3e3b..2f519f66bb8b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/capitalization.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/capitalization.py
@@ -103,14 +103,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """capitalization.Capitalization - a model defined in OpenAPI
 
         Keyword Args:
@@ -121,8 +121,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -154,7 +154,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/cat.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/cat.py
index a4d93019f7c9..dd5456cbb42b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/cat.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/cat.py
@@ -114,7 +114,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -124,7 +124,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, class_name, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """cat.Cat - a model defined in OpenAPI
 
         Args:
@@ -138,8 +138,8 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -167,7 +167,7 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -175,7 +175,7 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_json_variable_naming': _json_variable_naming,
+            '_spec_property_naming': spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/cat_all_of.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/cat_all_of.py
index d7f02a59b6b8..855371673ac3 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/cat_all_of.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/cat_all_of.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """cat_all_of.CatAllOf - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/category.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/category.py
index f39116c983c4..35eb224e17aa 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/category.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/category.py
@@ -95,14 +95,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, name='default-name', _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, name='default-name', _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """category.Category - a model defined in OpenAPI
 
         Args:
@@ -116,8 +116,8 @@ def __init__(self, name='default-name', _check_type=True, _json_variable_naming=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -144,7 +144,7 @@ def __init__(self, name='default-name', _check_type=True, _json_variable_naming=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/class_model.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/class_model.py
index 5db2e1af5547..6244421e6014 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/class_model.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/class_model.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """class_model.ClassModel - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/client.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/client.py
index bd5ce5ade76c..f5c6854bbaeb 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/client.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/client.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """client.Client - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/complex_quadrilateral.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/complex_quadrilateral.py
index 308494e0dd28..397608d1f97c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/complex_quadrilateral.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/complex_quadrilateral.py
@@ -103,7 +103,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -113,7 +113,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, shape_type, quadrilateral_type, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, shape_type, quadrilateral_type, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """complex_quadrilateral.ComplexQuadrilateral - a model defined in OpenAPI
 
         Args:
@@ -128,8 +128,8 @@ def __init__(self, shape_type, quadrilateral_type, _check_type=True, _json_varia
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -155,7 +155,7 @@ def __init__(self, shape_type, quadrilateral_type, _check_type=True, _json_varia
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -163,7 +163,7 @@ def __init__(self, shape_type, quadrilateral_type, _check_type=True, _json_varia
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_json_variable_naming': _json_variable_naming,
+            '_spec_property_naming': spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/dog.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/dog.py
index 3f55b0a81a40..4477c9b7394c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/dog.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/dog.py
@@ -109,7 +109,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -119,7 +119,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, class_name, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """dog.Dog - a model defined in OpenAPI
 
         Args:
@@ -133,8 +133,8 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -162,7 +162,7 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -170,7 +170,7 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_json_variable_naming': _json_variable_naming,
+            '_spec_property_naming': spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/dog_all_of.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/dog_all_of.py
index 33b5478fc206..fe4e3ebe28d2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/dog_all_of.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/dog_all_of.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """dog_all_of.DogAllOf - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/drawing.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/drawing.py
index 6bf63b5d3578..f147a27dfa64 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/drawing.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/drawing.py
@@ -114,14 +114,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """drawing.Drawing - a model defined in OpenAPI
 
         Keyword Args:
@@ -132,8 +132,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -163,7 +163,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/enum_arrays.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/enum_arrays.py
index f2d46eb36037..fd06d3eb3849 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/enum_arrays.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/enum_arrays.py
@@ -103,14 +103,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """enum_arrays.EnumArrays - a model defined in OpenAPI
 
         Keyword Args:
@@ -121,8 +121,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -150,7 +150,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/enum_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/enum_class.py
index 9185052ee078..6e59d0162be2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/enum_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/enum_class.py
@@ -90,14 +90,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, value='-efg', _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, value='-efg', _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """enum_class.EnumClass - a model defined in OpenAPI
 
         Args:
@@ -111,8 +111,8 @@ def __init__(self, value='-efg', _check_type=True, _json_variable_naming=False,
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -138,7 +138,7 @@ def __init__(self, value='-efg', _check_type=True, _json_variable_naming=False,
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/enum_test.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/enum_test.py
index e63009c2db02..03765653e38d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/enum_test.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/enum_test.py
@@ -145,14 +145,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, enum_string_required, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, enum_string_required, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """enum_test.EnumTest - a model defined in OpenAPI
 
         Args:
@@ -166,8 +166,8 @@ def __init__(self, enum_string_required, _check_type=True, _json_variable_naming
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -200,7 +200,7 @@ def __init__(self, enum_string_required, _check_type=True, _json_variable_naming
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/equilateral_triangle.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/equilateral_triangle.py
index 0d28442965d4..0a7a69b86b15 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/equilateral_triangle.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/equilateral_triangle.py
@@ -103,7 +103,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -113,7 +113,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, shape_type, triangle_type, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, shape_type, triangle_type, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """equilateral_triangle.EquilateralTriangle - a model defined in OpenAPI
 
         Args:
@@ -128,8 +128,8 @@ def __init__(self, shape_type, triangle_type, _check_type=True, _json_variable_n
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -155,7 +155,7 @@ def __init__(self, shape_type, triangle_type, _check_type=True, _json_variable_n
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -163,7 +163,7 @@ def __init__(self, shape_type, triangle_type, _check_type=True, _json_variable_n
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_json_variable_naming': _json_variable_naming,
+            '_spec_property_naming': spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/file.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/file.py
index e250c79fda4e..873052db9ace 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/file.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/file.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """file.File - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/file_schema_test_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/file_schema_test_class.py
index 874969d8a892..32dd82773dd7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/file_schema_test_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/file_schema_test_class.py
@@ -100,14 +100,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """file_schema_test_class.FileSchemaTestClass - a model defined in OpenAPI
 
         Keyword Args:
@@ -118,8 +118,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -147,7 +147,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/foo.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/foo.py
index 4b98b158e768..0faf613dab2b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/foo.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/foo.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """foo.Foo - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/format_test.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/format_test.py
index 3121c1e49148..cd9e7ddda526 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/format_test.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/format_test.py
@@ -164,14 +164,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, number, byte, date, password, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, number, byte, date, password, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """format_test.FormatTest - a model defined in OpenAPI
 
         Args:
@@ -188,8 +188,8 @@ def __init__(self, number, byte, date, password, _check_type=True, _json_variabl
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -226,7 +226,7 @@ def __init__(self, number, byte, date, password, _check_type=True, _json_variabl
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/fruit.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/fruit.py
index 9e6f9cfd7de0..bff97915cbef 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/fruit.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/fruit.py
@@ -118,7 +118,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -128,7 +128,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """fruit.Fruit - a model defined in OpenAPI
 
         Keyword Args:
@@ -139,8 +139,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -170,7 +170,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -178,7 +178,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_json_variable_naming': _json_variable_naming,
+            '_spec_property_naming': spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/fruit_req.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/fruit_req.py
index 6b7523371550..b74eeb1610b2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/fruit_req.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/fruit_req.py
@@ -107,7 +107,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -117,7 +117,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, cultivar=nulltype.Null, length_cm=nulltype.Null, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, cultivar=nulltype.Null, length_cm=nulltype.Null, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """fruit_req.FruitReq - a model defined in OpenAPI
 
         Args:
@@ -132,8 +132,8 @@ def __init__(self, cultivar=nulltype.Null, length_cm=nulltype.Null, _check_type=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -161,7 +161,7 @@ def __init__(self, cultivar=nulltype.Null, length_cm=nulltype.Null, _check_type=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -169,7 +169,7 @@ def __init__(self, cultivar=nulltype.Null, length_cm=nulltype.Null, _check_type=
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_json_variable_naming': _json_variable_naming,
+            '_spec_property_naming': spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/gm_fruit.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/gm_fruit.py
index 25602e15c206..6560d3675035 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/gm_fruit.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/gm_fruit.py
@@ -118,7 +118,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -128,7 +128,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """gm_fruit.GmFruit - a model defined in OpenAPI
 
         Keyword Args:
@@ -139,8 +139,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -170,7 +170,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -178,7 +178,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_json_variable_naming': _json_variable_naming,
+            '_spec_property_naming': spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/has_only_read_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/has_only_read_only.py
index 22623afe8169..a80d49539b38 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/has_only_read_only.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/has_only_read_only.py
@@ -95,14 +95,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """has_only_read_only.HasOnlyReadOnly - a model defined in OpenAPI
 
         Keyword Args:
@@ -113,8 +113,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -142,7 +142,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/health_check_result.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/health_check_result.py
index daeec2716e6b..5e16487a37b9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/health_check_result.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/health_check_result.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """health_check_result.HealthCheckResult - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object.py
index ffff566e5a22..0392e5d816ac 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object.py
@@ -95,14 +95,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """inline_object.InlineObject - a model defined in OpenAPI
 
         Keyword Args:
@@ -113,8 +113,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -142,7 +142,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object1.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object1.py
index 4a84000a9488..f4c6c2e2e33a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object1.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object1.py
@@ -95,14 +95,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """inline_object1.InlineObject1 - a model defined in OpenAPI
 
         Keyword Args:
@@ -113,8 +113,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -142,7 +142,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object2.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object2.py
index 3c33992a86b6..49f5d316465a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object2.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object2.py
@@ -104,14 +104,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """inline_object2.InlineObject2 - a model defined in OpenAPI
 
         Keyword Args:
@@ -122,8 +122,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -151,7 +151,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object3.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object3.py
index bc2f940ccc42..709c13c15fae 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object3.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object3.py
@@ -153,14 +153,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, number, double, pattern_without_delimiter, byte, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, number, double, pattern_without_delimiter, byte, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """inline_object3.InlineObject3 - a model defined in OpenAPI
 
         Args:
@@ -177,8 +177,8 @@ def __init__(self, number, double, pattern_without_delimiter, byte, _check_type=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -214,7 +214,7 @@ def __init__(self, number, double, pattern_without_delimiter, byte, _check_type=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object4.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object4.py
index 984bf598e72a..15384c01f46c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object4.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object4.py
@@ -95,14 +95,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, param, param2, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, param, param2, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """inline_object4.InlineObject4 - a model defined in OpenAPI
 
         Args:
@@ -117,8 +117,8 @@ def __init__(self, param, param2, _check_type=True, _json_variable_naming=False,
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -144,7 +144,7 @@ def __init__(self, param, param2, _check_type=True, _json_variable_naming=False,
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object5.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object5.py
index 6e45f5b0f296..c354b73a4d27 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object5.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_object5.py
@@ -95,14 +95,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, required_file, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, required_file, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """inline_object5.InlineObject5 - a model defined in OpenAPI
 
         Args:
@@ -116,8 +116,8 @@ def __init__(self, required_file, _check_type=True, _json_variable_naming=False,
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -144,7 +144,7 @@ def __init__(self, required_file, _check_type=True, _json_variable_naming=False,
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_response_default.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_response_default.py
index bcb80054dc5a..e564a35cc02d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_response_default.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/inline_response_default.py
@@ -98,14 +98,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """inline_response_default.InlineResponseDefault - a model defined in OpenAPI
 
         Keyword Args:
@@ -116,8 +116,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -144,7 +144,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/isosceles_triangle.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/isosceles_triangle.py
index e2f67fc58465..cc1714e54391 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/isosceles_triangle.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/isosceles_triangle.py
@@ -103,7 +103,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -113,7 +113,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, shape_type, triangle_type, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, shape_type, triangle_type, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """isosceles_triangle.IsoscelesTriangle - a model defined in OpenAPI
 
         Args:
@@ -128,8 +128,8 @@ def __init__(self, shape_type, triangle_type, _check_type=True, _json_variable_n
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -155,7 +155,7 @@ def __init__(self, shape_type, triangle_type, _check_type=True, _json_variable_n
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -163,7 +163,7 @@ def __init__(self, shape_type, triangle_type, _check_type=True, _json_variable_n
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_json_variable_naming': _json_variable_naming,
+            '_spec_property_naming': spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/list.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/list.py
index 772d64c877bd..93acc4dd8de1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/list.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/list.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """list.List - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/mammal.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/mammal.py
index b51697d25ce1..fe9ddd41920c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/mammal.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/mammal.py
@@ -118,7 +118,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -128,7 +128,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, class_name, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """mammal.Mammal - a model defined in OpenAPI
 
         Args:
@@ -142,8 +142,8 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -172,7 +172,7 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -180,7 +180,7 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_json_variable_naming': _json_variable_naming,
+            '_spec_property_naming': spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/map_test.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/map_test.py
index 487e2a3793f5..1d58629e43bb 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/map_test.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/map_test.py
@@ -108,14 +108,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """map_test.MapTest - a model defined in OpenAPI
 
         Keyword Args:
@@ -126,8 +126,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -157,7 +157,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/mixed_properties_and_additional_properties_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/mixed_properties_and_additional_properties_class.py
index 42a9b15b86fb..bbae3d50a071 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/mixed_properties_and_additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/mixed_properties_and_additional_properties_class.py
@@ -102,14 +102,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """mixed_properties_and_additional_properties_class.MixedPropertiesAndAdditionalPropertiesClass - a model defined in OpenAPI
 
         Keyword Args:
@@ -120,8 +120,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -150,7 +150,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/model200_response.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/model200_response.py
index bc00b7694177..bbbe72bd1ceb 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/model200_response.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/model200_response.py
@@ -95,14 +95,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """model200_response.Model200Response - a model defined in OpenAPI
 
         Keyword Args:
@@ -113,8 +113,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -142,7 +142,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/model_return.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/model_return.py
index 76f4315edc86..80a187b13fbc 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/model_return.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/model_return.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """model_return.ModelReturn - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/name.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/name.py
index fc7922375034..96d4ffd69f87 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/name.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/name.py
@@ -99,14 +99,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, name, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, name, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """name.Name - a model defined in OpenAPI
 
         Args:
@@ -120,8 +120,8 @@ def __init__(self, name, _check_type=True, _json_variable_naming=False, _path_to
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -150,7 +150,7 @@ def __init__(self, name, _check_type=True, _json_variable_naming=False, _path_to
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/nullable_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/nullable_class.py
index a6de58a90327..da0012834409 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/nullable_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/nullable_class.py
@@ -115,14 +115,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """nullable_class.NullableClass - a model defined in OpenAPI
 
         Keyword Args:
@@ -133,8 +133,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -172,7 +172,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/nullable_shape.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/nullable_shape.py
index 16c86a0d8f1b..f9fea81786ae 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/nullable_shape.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/nullable_shape.py
@@ -111,7 +111,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -121,7 +121,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, shape_type, quadrilateral_type=nulltype.Null, triangle_type=nulltype.Null, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, shape_type, quadrilateral_type=nulltype.Null, triangle_type=nulltype.Null, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """nullable_shape.NullableShape - a model defined in OpenAPI
 
         Args:
@@ -137,8 +137,8 @@ def __init__(self, shape_type, quadrilateral_type=nulltype.Null, triangle_type=n
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -164,7 +164,7 @@ def __init__(self, shape_type, quadrilateral_type=nulltype.Null, triangle_type=n
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -172,7 +172,7 @@ def __init__(self, shape_type, quadrilateral_type=nulltype.Null, triangle_type=n
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_json_variable_naming': _json_variable_naming,
+            '_spec_property_naming': spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/number_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/number_only.py
index ca0e364039f4..5e84c5a16f40 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/number_only.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/number_only.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """number_only.NumberOnly - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/order.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/order.py
index d43a0b84de2e..535fe7cd9962 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/order.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/order.py
@@ -108,14 +108,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """order.Order - a model defined in OpenAPI
 
         Keyword Args:
@@ -126,8 +126,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -159,7 +159,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_composite.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_composite.py
index 8e894dbd0bf2..fc2b2dd1736c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_composite.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_composite.py
@@ -97,14 +97,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """outer_composite.OuterComposite - a model defined in OpenAPI
 
         Keyword Args:
@@ -115,8 +115,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -145,7 +145,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_enum.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_enum.py
index 01abd423a79c..58c7c3b5d72c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_enum.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_enum.py
@@ -91,14 +91,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, value, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, value, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """outer_enum.OuterEnum - a model defined in OpenAPI
 
         Args:
@@ -112,8 +112,8 @@ def __init__(self, value, _check_type=True, _json_variable_naming=False, _path_t
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, value, _check_type=True, _json_variable_naming=False, _path_t
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_enum_default_value.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_enum_default_value.py
index 079df1a4eace..198740fdb9cb 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_enum_default_value.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_enum_default_value.py
@@ -90,14 +90,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, value='placed', _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, value='placed', _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """outer_enum_default_value.OuterEnumDefaultValue - a model defined in OpenAPI
 
         Args:
@@ -111,8 +111,8 @@ def __init__(self, value='placed', _check_type=True, _json_variable_naming=False
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -138,7 +138,7 @@ def __init__(self, value='placed', _check_type=True, _json_variable_naming=False
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_enum_integer.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_enum_integer.py
index e4933835b3d9..86292ab185a8 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_enum_integer.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_enum_integer.py
@@ -90,14 +90,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, value, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, value, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """outer_enum_integer.OuterEnumInteger - a model defined in OpenAPI
 
         Args:
@@ -111,8 +111,8 @@ def __init__(self, value, _check_type=True, _json_variable_naming=False, _path_t
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -138,7 +138,7 @@ def __init__(self, value, _check_type=True, _json_variable_naming=False, _path_t
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_enum_integer_default_value.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_enum_integer_default_value.py
index a5d319855f78..da9f8a73f9b5 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_enum_integer_default_value.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/outer_enum_integer_default_value.py
@@ -90,14 +90,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, value=0, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, value=0, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """outer_enum_integer_default_value.OuterEnumIntegerDefaultValue - a model defined in OpenAPI
 
         Args:
@@ -111,8 +111,8 @@ def __init__(self, value=0, _check_type=True, _json_variable_naming=False, _path
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -138,7 +138,7 @@ def __init__(self, value=0, _check_type=True, _json_variable_naming=False, _path
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/pet.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/pet.py
index 6f442d55ba60..7ca5ab6d2240 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/pet.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/pet.py
@@ -118,14 +118,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, name, photo_urls, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, name, photo_urls, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """pet.Pet - a model defined in OpenAPI
 
         Args:
@@ -140,8 +140,8 @@ def __init__(self, name, photo_urls, _check_type=True, _json_variable_naming=Fal
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -171,7 +171,7 @@ def __init__(self, name, photo_urls, _check_type=True, _json_variable_naming=Fal
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/quadrilateral.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/quadrilateral.py
index c110dc04370a..168073cef86b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/quadrilateral.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/quadrilateral.py
@@ -109,7 +109,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -119,7 +119,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, quadrilateral_type, shape_type=nulltype.Null, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, quadrilateral_type, shape_type=nulltype.Null, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """quadrilateral.Quadrilateral - a model defined in OpenAPI
 
         Args:
@@ -134,8 +134,8 @@ def __init__(self, quadrilateral_type, shape_type=nulltype.Null, _check_type=Tru
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -161,7 +161,7 @@ def __init__(self, quadrilateral_type, shape_type=nulltype.Null, _check_type=Tru
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -169,7 +169,7 @@ def __init__(self, quadrilateral_type, shape_type=nulltype.Null, _check_type=Tru
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_json_variable_naming': _json_variable_naming,
+            '_spec_property_naming': spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/quadrilateral_interface.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/quadrilateral_interface.py
index 87173f023755..ad6748b31a06 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/quadrilateral_interface.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/quadrilateral_interface.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, quadrilateral_type, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, quadrilateral_type, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """quadrilateral_interface.QuadrilateralInterface - a model defined in OpenAPI
 
         Args:
@@ -114,8 +114,8 @@ def __init__(self, quadrilateral_type, _check_type=True, _json_variable_naming=F
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -141,7 +141,7 @@ def __init__(self, quadrilateral_type, _check_type=True, _json_variable_naming=F
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/read_only_first.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/read_only_first.py
index 5968c992a38c..d5f4f1bfba44 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/read_only_first.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/read_only_first.py
@@ -95,14 +95,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """read_only_first.ReadOnlyFirst - a model defined in OpenAPI
 
         Keyword Args:
@@ -113,8 +113,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -142,7 +142,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/scalene_triangle.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/scalene_triangle.py
index 6819f3303bd5..71ca9c9c2220 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/scalene_triangle.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/scalene_triangle.py
@@ -103,7 +103,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -113,7 +113,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, shape_type, triangle_type, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, shape_type, triangle_type, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """scalene_triangle.ScaleneTriangle - a model defined in OpenAPI
 
         Args:
@@ -128,8 +128,8 @@ def __init__(self, shape_type, triangle_type, _check_type=True, _json_variable_n
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -155,7 +155,7 @@ def __init__(self, shape_type, triangle_type, _check_type=True, _json_variable_n
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -163,7 +163,7 @@ def __init__(self, shape_type, triangle_type, _check_type=True, _json_variable_n
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_json_variable_naming': _json_variable_naming,
+            '_spec_property_naming': spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/shape.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/shape.py
index 5d656c7e41c0..1ea3fba79bd0 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/shape.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/shape.py
@@ -111,7 +111,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -121,7 +121,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, shape_type, quadrilateral_type=nulltype.Null, triangle_type=nulltype.Null, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, shape_type, quadrilateral_type=nulltype.Null, triangle_type=nulltype.Null, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """shape.Shape - a model defined in OpenAPI
 
         Args:
@@ -137,8 +137,8 @@ def __init__(self, shape_type, quadrilateral_type=nulltype.Null, triangle_type=n
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -164,7 +164,7 @@ def __init__(self, shape_type, quadrilateral_type=nulltype.Null, triangle_type=n
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -172,7 +172,7 @@ def __init__(self, shape_type, quadrilateral_type=nulltype.Null, triangle_type=n
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_json_variable_naming': _json_variable_naming,
+            '_spec_property_naming': spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/shape_interface.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/shape_interface.py
index 35e54867ba4c..037fe026e18a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/shape_interface.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/shape_interface.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, shape_type, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, shape_type, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """shape_interface.ShapeInterface - a model defined in OpenAPI
 
         Args:
@@ -114,8 +114,8 @@ def __init__(self, shape_type, _check_type=True, _json_variable_naming=False, _p
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -141,7 +141,7 @@ def __init__(self, shape_type, _check_type=True, _json_variable_naming=False, _p
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/shape_or_null.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/shape_or_null.py
index 93a80fda8942..48dd1090580f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/shape_or_null.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/shape_or_null.py
@@ -111,7 +111,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -121,7 +121,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, shape_type, quadrilateral_type=nulltype.Null, triangle_type=nulltype.Null, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, shape_type, quadrilateral_type=nulltype.Null, triangle_type=nulltype.Null, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """shape_or_null.ShapeOrNull - a model defined in OpenAPI
 
         Args:
@@ -137,8 +137,8 @@ def __init__(self, shape_type, quadrilateral_type=nulltype.Null, triangle_type=n
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -164,7 +164,7 @@ def __init__(self, shape_type, quadrilateral_type=nulltype.Null, triangle_type=n
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -172,7 +172,7 @@ def __init__(self, shape_type, quadrilateral_type=nulltype.Null, triangle_type=n
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_json_variable_naming': _json_variable_naming,
+            '_spec_property_naming': spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/simple_quadrilateral.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/simple_quadrilateral.py
index c3c22c8f1ace..ef8747d64366 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/simple_quadrilateral.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/simple_quadrilateral.py
@@ -103,7 +103,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -113,7 +113,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, shape_type, quadrilateral_type, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, shape_type, quadrilateral_type, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """simple_quadrilateral.SimpleQuadrilateral - a model defined in OpenAPI
 
         Args:
@@ -128,8 +128,8 @@ def __init__(self, shape_type, quadrilateral_type, _check_type=True, _json_varia
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -155,7 +155,7 @@ def __init__(self, shape_type, quadrilateral_type, _check_type=True, _json_varia
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -163,7 +163,7 @@ def __init__(self, shape_type, quadrilateral_type, _check_type=True, _json_varia
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_json_variable_naming': _json_variable_naming,
+            '_spec_property_naming': spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/special_model_name.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/special_model_name.py
index 42e4dd0dfe39..0f168298d2a2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/special_model_name.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/special_model_name.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """special_model_name.SpecialModelName - a model defined in OpenAPI
 
         Keyword Args:
@@ -111,8 +111,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -139,7 +139,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/string_boolean_map.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/string_boolean_map.py
index 3c117269fd32..ba0938507be9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/string_boolean_map.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/string_boolean_map.py
@@ -91,14 +91,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """string_boolean_map.StringBooleanMap - a model defined in OpenAPI
 
         Keyword Args:
@@ -109,8 +109,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -136,7 +136,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/tag.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/tag.py
index 7efefe09c4c4..eb62f13dbe24 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/tag.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/tag.py
@@ -95,14 +95,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """tag.Tag - a model defined in OpenAPI
 
         Keyword Args:
@@ -113,8 +113,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -142,7 +142,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/triangle.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/triangle.py
index b8cb767dc2a6..4c822ebe37e0 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/triangle.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/triangle.py
@@ -115,7 +115,7 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
@@ -125,7 +125,7 @@ def discriminator():
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, triangle_type, shape_type=nulltype.Null, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, triangle_type, shape_type=nulltype.Null, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """triangle.Triangle - a model defined in OpenAPI
 
         Args:
@@ -140,8 +140,8 @@ def __init__(self, triangle_type, shape_type=nulltype.Null, _check_type=True, _j
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -167,7 +167,7 @@ def __init__(self, triangle_type, shape_type=nulltype.Null, _check_type=True, _j
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
@@ -175,7 +175,7 @@ def __init__(self, triangle_type, shape_type=nulltype.Null, _check_type=True, _j
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_json_variable_naming': _json_variable_naming,
+            '_spec_property_naming': spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/triangle_interface.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/triangle_interface.py
index 20bd0d802b63..5fb969a64bef 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/triangle_interface.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/triangle_interface.py
@@ -93,14 +93,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, triangle_type, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, triangle_type, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """triangle_interface.TriangleInterface - a model defined in OpenAPI
 
         Args:
@@ -114,8 +114,8 @@ def __init__(self, triangle_type, _check_type=True, _json_variable_naming=False,
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -141,7 +141,7 @@ def __init__(self, triangle_type, _check_type=True, _json_variable_naming=False,
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/user.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/user.py
index 6a7de9069393..01f08a6776a6 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/user.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/user.py
@@ -115,14 +115,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """user.User - a model defined in OpenAPI
 
         Keyword Args:
@@ -133,8 +133,8 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -172,7 +172,7 @@ def __init__(self, _check_type=True, _json_variable_naming=False, _path_to_item=
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/whale.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/whale.py
index 98276d737bed..f39c28174404 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/whale.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/whale.py
@@ -97,14 +97,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, class_name, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """whale.Whale - a model defined in OpenAPI
 
         Args:
@@ -118,8 +118,8 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -147,7 +147,7 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/zebra.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/zebra.py
index 0761e1d04031..7dd5f1ab35f3 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/zebra.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/zebra.py
@@ -100,14 +100,14 @@ def discriminator():
     required_properties = set([
         '_data_store',
         '_check_type',
-        '_json_variable_naming',
+        '_spec_property_naming',
         '_path_to_item',
         '_configuration',
         '_visited_composed_classes',
     ])
 
     @convert_js_args_to_python_args
-    def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
+    def __init__(self, class_name, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs):  # noqa: E501
         """zebra.Zebra - a model defined in OpenAPI
 
         Args:
@@ -121,8 +121,8 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
             _path_to_item (tuple/list): This is a list of keys or values to
                                 drill down to the model in received_data
                                 when deserializing a response
-            _json_variable_naming (bool): True if the variable names in the input data
-                                are JSON names, as listed in the OpenAPI document.
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
                                 False if the variable names in the input data
                                 are pythonic names, e.g. snake case (default)
             _configuration (Configuration): the instance to use when
@@ -149,7 +149,7 @@ def __init__(self, class_name, _check_type=True, _json_variable_naming=False, _p
 
         self._data_store = {}
         self._check_type = _check_type
-        self._json_variable_naming = _json_variable_naming
+        self._spec_property_naming = _spec_property_naming
         self._path_to_item = _path_to_item
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)

From b35d43cf4dfb8025527309def4591123f9d18a4e Mon Sep 17 00:00:00 2001
From: "Sebastien Rosset (serosset)" <serosset@cisco.com>
Date: Thu, 21 May 2020 23:16:02 -0700
Subject: [PATCH 07/11] fix typo

---
 .../petstore/python-experimental/petstore_api/models/dog.py     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/client/petstore/python-experimental/petstore_api/models/dog.py b/samples/client/petstore/python-experimental/petstore_api/models/dog.py
index 4477c9b7394c..c4dfd08695d4 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/dog.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/dog.py
@@ -170,7 +170,7 @@ def __init__(self, class_name, _check_type=True, _spec_property_naming=False, _p
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_spec_property_naming': spec_property_naming,
+            '_spec_property_naming': _spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }

From 3218b2dc34d61317052b13f43d48cdd51f8598ae Mon Sep 17 00:00:00 2001
From: "Sebastien Rosset (serosset)" <serosset@cisco.com>
Date: Thu, 21 May 2020 23:22:42 -0700
Subject: [PATCH 08/11] fix typo

---
 .../model_templates/method_init_composed.mustache               | 2 +-
 .../petstore/python-experimental/petstore_api/models/cat.py     | 2 +-
 .../petstore/python-experimental/petstore_api/models/child.py   | 2 +-
 .../python-experimental/petstore_api/models/child_cat.py        | 2 +-
 .../python-experimental/petstore_api/models/child_dog.py        | 2 +-
 .../python-experimental/petstore_api/models/child_lizard.py     | 2 +-
 .../petstore/python-experimental/petstore_api/models/parent.py  | 2 +-
 .../python-experimental/petstore_api/models/parent_pet.py       | 2 +-
 .../python-experimental/petstore_api/models/biology_hominid.py  | 2 +-
 .../python-experimental/petstore_api/models/biology_mammal.py   | 2 +-
 .../python-experimental/petstore_api/models/biology_primate.py  | 2 +-
 .../python-experimental/petstore_api/models/biology_reptile.py  | 2 +-
 .../petstore/python-experimental/petstore_api/models/cat.py     | 2 +-
 .../petstore_api/models/complex_quadrilateral.py                | 2 +-
 .../petstore/python-experimental/petstore_api/models/dog.py     | 2 +-
 .../petstore_api/models/equilateral_triangle.py                 | 2 +-
 .../petstore/python-experimental/petstore_api/models/fruit.py   | 2 +-
 .../python-experimental/petstore_api/models/fruit_req.py        | 2 +-
 .../python-experimental/petstore_api/models/gm_fruit.py         | 2 +-
 .../petstore_api/models/isosceles_triangle.py                   | 2 +-
 .../petstore/python-experimental/petstore_api/models/mammal.py  | 2 +-
 .../python-experimental/petstore_api/models/nullable_shape.py   | 2 +-
 .../python-experimental/petstore_api/models/quadrilateral.py    | 2 +-
 .../python-experimental/petstore_api/models/scalene_triangle.py | 2 +-
 .../petstore/python-experimental/petstore_api/models/shape.py   | 2 +-
 .../python-experimental/petstore_api/models/shape_or_null.py    | 2 +-
 .../petstore_api/models/simple_quadrilateral.py                 | 2 +-
 .../python-experimental/petstore_api/models/triangle.py         | 2 +-
 28 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_init_composed.mustache b/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_init_composed.mustache
index 9bcccce02fe7..67750cb17a83 100644
--- a/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_init_composed.mustache
+++ b/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_init_composed.mustache
@@ -15,7 +15,7 @@
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_spec_property_naming': spec_property_naming,
+            '_spec_property_naming': _spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/cat.py b/samples/client/petstore/python-experimental/petstore_api/models/cat.py
index 103ff8cfe678..d32b2ebf81e7 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/cat.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/cat.py
@@ -170,7 +170,7 @@ def __init__(self, class_name, _check_type=True, _spec_property_naming=False, _p
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_spec_property_naming': spec_property_naming,
+            '_spec_property_naming': _spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/child.py b/samples/client/petstore/python-experimental/petstore_api/models/child.py
index 1fb269fbe95f..d1dfadd0f21a 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/child.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/child.py
@@ -164,7 +164,7 @@ def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_spec_property_naming': spec_property_naming,
+            '_spec_property_naming': _spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/child_cat.py b/samples/client/petstore/python-experimental/petstore_api/models/child_cat.py
index ae4edc0d2ddf..3d79c4358414 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/child_cat.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/child_cat.py
@@ -167,7 +167,7 @@ def __init__(self, pet_type, _check_type=True, _spec_property_naming=False, _pat
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_spec_property_naming': spec_property_naming,
+            '_spec_property_naming': _spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/child_dog.py b/samples/client/petstore/python-experimental/petstore_api/models/child_dog.py
index fcb49d9e2eea..d747e269486d 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/child_dog.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/child_dog.py
@@ -167,7 +167,7 @@ def __init__(self, pet_type, _check_type=True, _spec_property_naming=False, _pat
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_spec_property_naming': spec_property_naming,
+            '_spec_property_naming': _spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/child_lizard.py b/samples/client/petstore/python-experimental/petstore_api/models/child_lizard.py
index fb351da52959..8a7df71181a3 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/child_lizard.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/child_lizard.py
@@ -167,7 +167,7 @@ def __init__(self, pet_type, _check_type=True, _spec_property_naming=False, _pat
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_spec_property_naming': spec_property_naming,
+            '_spec_property_naming': _spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/parent.py b/samples/client/petstore/python-experimental/petstore_api/models/parent.py
index 36e6c4151391..a64fd034a352 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/parent.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/parent.py
@@ -161,7 +161,7 @@ def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_spec_property_naming': spec_property_naming,
+            '_spec_property_naming': _spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/parent_pet.py b/samples/client/petstore/python-experimental/petstore_api/models/parent_pet.py
index e8e3d49f379a..5f709f6947b3 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/parent_pet.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/parent_pet.py
@@ -177,7 +177,7 @@ def __init__(self, pet_type, _check_type=True, _spec_property_naming=False, _pat
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_spec_property_naming': spec_property_naming,
+            '_spec_property_naming': _spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_hominid.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_hominid.py
index 9994e4b2fff5..2ef3b012f7fd 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_hominid.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_hominid.py
@@ -159,7 +159,7 @@ def __init__(self, class_name, _check_type=True, _spec_property_naming=False, _p
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_spec_property_naming': spec_property_naming,
+            '_spec_property_naming': _spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_mammal.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_mammal.py
index 2d64f27bde93..3aedd7f2b2a2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_mammal.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_mammal.py
@@ -171,7 +171,7 @@ def __init__(self, class_name, _check_type=True, _spec_property_naming=False, _p
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_spec_property_naming': spec_property_naming,
+            '_spec_property_naming': _spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_primate.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_primate.py
index 5c110ab85399..b643a3c9001d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_primate.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_primate.py
@@ -165,7 +165,7 @@ def __init__(self, class_name, _check_type=True, _spec_property_naming=False, _p
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_spec_property_naming': spec_property_naming,
+            '_spec_property_naming': _spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_reptile.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_reptile.py
index faf0b637dc1b..0dafde084093 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_reptile.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/biology_reptile.py
@@ -159,7 +159,7 @@ def __init__(self, class_name, _check_type=True, _spec_property_naming=False, _p
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_spec_property_naming': spec_property_naming,
+            '_spec_property_naming': _spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/cat.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/cat.py
index dd5456cbb42b..49991c2c7147 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/cat.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/cat.py
@@ -175,7 +175,7 @@ def __init__(self, class_name, _check_type=True, _spec_property_naming=False, _p
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_spec_property_naming': spec_property_naming,
+            '_spec_property_naming': _spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/complex_quadrilateral.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/complex_quadrilateral.py
index 397608d1f97c..a1656978ed6a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/complex_quadrilateral.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/complex_quadrilateral.py
@@ -163,7 +163,7 @@ def __init__(self, shape_type, quadrilateral_type, _check_type=True, _spec_prope
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_spec_property_naming': spec_property_naming,
+            '_spec_property_naming': _spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/dog.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/dog.py
index 4477c9b7394c..c4dfd08695d4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/dog.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/dog.py
@@ -170,7 +170,7 @@ def __init__(self, class_name, _check_type=True, _spec_property_naming=False, _p
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_spec_property_naming': spec_property_naming,
+            '_spec_property_naming': _spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/equilateral_triangle.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/equilateral_triangle.py
index 0a7a69b86b15..ba4d23a45ede 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/equilateral_triangle.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/equilateral_triangle.py
@@ -163,7 +163,7 @@ def __init__(self, shape_type, triangle_type, _check_type=True, _spec_property_n
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_spec_property_naming': spec_property_naming,
+            '_spec_property_naming': _spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/fruit.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/fruit.py
index bff97915cbef..b31773395d4d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/fruit.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/fruit.py
@@ -178,7 +178,7 @@ def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_spec_property_naming': spec_property_naming,
+            '_spec_property_naming': _spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/fruit_req.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/fruit_req.py
index b74eeb1610b2..0ba3d104fa15 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/fruit_req.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/fruit_req.py
@@ -169,7 +169,7 @@ def __init__(self, cultivar=nulltype.Null, length_cm=nulltype.Null, _check_type=
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_spec_property_naming': spec_property_naming,
+            '_spec_property_naming': _spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/gm_fruit.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/gm_fruit.py
index 6560d3675035..f1a84f2c52ce 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/gm_fruit.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/gm_fruit.py
@@ -178,7 +178,7 @@ def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_spec_property_naming': spec_property_naming,
+            '_spec_property_naming': _spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/isosceles_triangle.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/isosceles_triangle.py
index cc1714e54391..63d8262173e7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/isosceles_triangle.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/isosceles_triangle.py
@@ -163,7 +163,7 @@ def __init__(self, shape_type, triangle_type, _check_type=True, _spec_property_n
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_spec_property_naming': spec_property_naming,
+            '_spec_property_naming': _spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/mammal.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/mammal.py
index fe9ddd41920c..b0e681737a95 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/mammal.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/mammal.py
@@ -180,7 +180,7 @@ def __init__(self, class_name, _check_type=True, _spec_property_naming=False, _p
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_spec_property_naming': spec_property_naming,
+            '_spec_property_naming': _spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/nullable_shape.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/nullable_shape.py
index f9fea81786ae..fe7e2e979312 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/nullable_shape.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/nullable_shape.py
@@ -172,7 +172,7 @@ def __init__(self, shape_type, quadrilateral_type=nulltype.Null, triangle_type=n
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_spec_property_naming': spec_property_naming,
+            '_spec_property_naming': _spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/quadrilateral.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/quadrilateral.py
index 168073cef86b..344ecb14c4ec 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/quadrilateral.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/quadrilateral.py
@@ -169,7 +169,7 @@ def __init__(self, quadrilateral_type, shape_type=nulltype.Null, _check_type=Tru
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_spec_property_naming': spec_property_naming,
+            '_spec_property_naming': _spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/scalene_triangle.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/scalene_triangle.py
index 71ca9c9c2220..21ce8ff78ca6 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/scalene_triangle.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/scalene_triangle.py
@@ -163,7 +163,7 @@ def __init__(self, shape_type, triangle_type, _check_type=True, _spec_property_n
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_spec_property_naming': spec_property_naming,
+            '_spec_property_naming': _spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/shape.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/shape.py
index 1ea3fba79bd0..5e41bcc93566 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/shape.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/shape.py
@@ -172,7 +172,7 @@ def __init__(self, shape_type, quadrilateral_type=nulltype.Null, triangle_type=n
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_spec_property_naming': spec_property_naming,
+            '_spec_property_naming': _spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/shape_or_null.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/shape_or_null.py
index 48dd1090580f..f4dd928a0608 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/shape_or_null.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/shape_or_null.py
@@ -172,7 +172,7 @@ def __init__(self, shape_type, quadrilateral_type=nulltype.Null, triangle_type=n
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_spec_property_naming': spec_property_naming,
+            '_spec_property_naming': _spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/simple_quadrilateral.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/simple_quadrilateral.py
index ef8747d64366..c368a854b311 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/simple_quadrilateral.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/simple_quadrilateral.py
@@ -163,7 +163,7 @@ def __init__(self, shape_type, quadrilateral_type, _check_type=True, _spec_prope
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_spec_property_naming': spec_property_naming,
+            '_spec_property_naming': _spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/triangle.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/triangle.py
index 4c822ebe37e0..68d3fa15152a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/triangle.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/triangle.py
@@ -175,7 +175,7 @@ def __init__(self, triangle_type, shape_type=nulltype.Null, _check_type=True, _s
         constant_args = {
             '_check_type': _check_type,
             '_path_to_item': _path_to_item,
-            '_spec_property_naming': spec_property_naming,
+            '_spec_property_naming': _spec_property_naming,
             '_configuration': _configuration,
             '_visited_composed_classes': self._visited_composed_classes,
         }

From bc6358d96888acdada9d9cb1e2a407e8a4337c6b Mon Sep 17 00:00:00 2001
From: "Sebastien Rosset (serosset)" <serosset@cisco.com>
Date: Fri, 22 May 2020 16:43:52 +0000
Subject: [PATCH 09/11] fix deprecation warning

---
 .../client/petstore/python-experimental/test/test_drawing.py  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/openapi3/client/petstore/python-experimental/test/test_drawing.py b/samples/openapi3/client/petstore/python-experimental/test/test_drawing.py
index be18468b4d42..c4c7d767c2d0 100644
--- a/samples/openapi3/client/petstore/python-experimental/test/test_drawing.py
+++ b/samples/openapi3/client/petstore/python-experimental/test/test_drawing.py
@@ -45,7 +45,7 @@ def test_create_instances(self):
               'shapeType': "Triangle",
               'triangleType': "IsoscelesTriangle"
         }
-        inst = petstore_api.Shape(_json_variable_naming=True, **data)
+        inst = petstore_api.Shape(**data, _spec_property_naming=True)
         assert isinstance(inst, petstore_api.IsoscelesTriangle)
 
     def test_deserialize_oneof_reference(self):
@@ -96,7 +96,7 @@ def test_deserialize_oneof_reference(self):
             "Required value type is {} and passed type was {} at {}")
         with self.assertRaisesRegexp(
             petstore_api.ApiTypeError,
-            err_msg.format("main_shape", "Shape", "NoneType", "\['main_shape'\]")
+            err_msg.format("main_shape", "Shape", "NoneType", r"['main_shape']")
         ):
             inst = petstore_api.Drawing(
                 # 'main_shape' has type 'Shape', which is a oneOf [triangle, quadrilateral]

From 1fcbc8970a3b70795773fc213a8e39db253a2422 Mon Sep 17 00:00:00 2001
From: "Sebastien Rosset (serosset)" <serosset@cisco.com>
Date: Fri, 22 May 2020 16:44:23 +0000
Subject: [PATCH 10/11] fix deprecation warning

---
 .../client/petstore/python-experimental/test/test_fruit.py      | 2 +-
 .../client/petstore/python-experimental/test/test_fruit_req.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/openapi3/client/petstore/python-experimental/test/test_fruit.py b/samples/openapi3/client/petstore/python-experimental/test/test_fruit.py
index 20f83968fd3d..ee9799fc6d32 100644
--- a/samples/openapi3/client/petstore/python-experimental/test/test_fruit.py
+++ b/samples/openapi3/client/petstore/python-experimental/test/test_fruit.py
@@ -74,7 +74,7 @@ def testFruit(self):
         # with getattr
         # Per Python doc, if the named attribute does not exist,
         # default is returned if provided.
-        self.assertEquals(getattr(fruit, 'cultivar', 'some value'), 'some value')
+        self.assertEqual(getattr(fruit, 'cultivar', 'some value'), 'some value')
 
         # Per Python doc, if the named attribute does not exist,
         # default is returned if provided, otherwise AttributeError is raised.
diff --git a/samples/openapi3/client/petstore/python-experimental/test/test_fruit_req.py b/samples/openapi3/client/petstore/python-experimental/test/test_fruit_req.py
index 21e55747e102..f3e03faf271c 100644
--- a/samples/openapi3/client/petstore/python-experimental/test/test_fruit_req.py
+++ b/samples/openapi3/client/petstore/python-experimental/test/test_fruit_req.py
@@ -57,7 +57,7 @@ def testFruitReq(self):
         with self.assertRaises(AttributeError):
             invalid_variable = fruit['cultivar']
         # with getattr
-        self.assertEquals(getattr(fruit, 'cultivar', 'some value'), 'some value')
+        self.assertEqual(getattr(fruit, 'cultivar', 'some value'), 'some value')
 
         with self.assertRaises(AttributeError):
             getattr(fruit, 'cultivar')

From c611d0be8473f2c4055d71d8bd351c846366354c Mon Sep 17 00:00:00 2001
From: "Sebastien Rosset (serosset)" <serosset@cisco.com>
Date: Fri, 22 May 2020 16:47:33 +0000
Subject: [PATCH 11/11] fix deprecation warning

---
 .../client/petstore/python-experimental/test/test_drawing.py  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/openapi3/client/petstore/python-experimental/test/test_drawing.py b/samples/openapi3/client/petstore/python-experimental/test/test_drawing.py
index c4c7d767c2d0..6897ce82676d 100644
--- a/samples/openapi3/client/petstore/python-experimental/test/test_drawing.py
+++ b/samples/openapi3/client/petstore/python-experimental/test/test_drawing.py
@@ -45,7 +45,7 @@ def test_create_instances(self):
               'shapeType': "Triangle",
               'triangleType': "IsoscelesTriangle"
         }
-        inst = petstore_api.Shape(**data, _spec_property_naming=True)
+        inst = petstore_api.Shape(_spec_property_naming=True, **data)
         assert isinstance(inst, petstore_api.IsoscelesTriangle)
 
     def test_deserialize_oneof_reference(self):
@@ -96,7 +96,7 @@ def test_deserialize_oneof_reference(self):
             "Required value type is {} and passed type was {} at {}")
         with self.assertRaisesRegexp(
             petstore_api.ApiTypeError,
-            err_msg.format("main_shape", "Shape", "NoneType", r"['main_shape']")
+            err_msg.format("main_shape", "Shape", "NoneType", "\['main_shape'\]")
         ):
             inst = petstore_api.Drawing(
                 # 'main_shape' has type 'Shape', which is a oneOf [triangle, quadrilateral]