Python-exp clean up model classnames (#7054)

* Adds lazy_import, removes python-exp java class renaming code, partial removal of getPythonClassName call sites Fixes PythonClientExperimentalTest.java Python-exp smaples regeneration Revers makefile Reverst pom.xml Fixes model imports in models.__init__ Updates docstring, omits lazy import in additional properties if we dont need it Improves additional_properties_type assignment if None Removes getPythonClassName Fixes python-exp tests * Removes unused makefiles
2020-07-27 18:35:41 -07:00
parent 2743242ef4
commit ee0686e13f
419 changed files with 2491 additions and 2229 deletions
--- a/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/x_auth_id_alias/model_utils.py
+++ b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/x_auth_id_alias/model_utils.py
@@ -41,9 +41,9 @@ class cached_property(object):
        self._fn = fn

    def __get__(self, instance, cls=None):
-        try:
+        if self.result_key in vars(self):
            return vars(self)[self.result_key]
-        except KeyError:
+        else:
            result = self._fn()
            setattr(self, self.result_key, result)
            return result
--- a/samples/openapi3/client/features/dynamic-servers/python-experimental/dynamic_servers/model_utils.py
+++ b/samples/openapi3/client/features/dynamic-servers/python-experimental/dynamic_servers/model_utils.py
@@ -41,9 +41,9 @@ class cached_property(object):
        self._fn = fn

    def __get__(self, instance, cls=None):
-        try:
+        if self.result_key in vars(self):
            return vars(self)[self.result_key]
-        except KeyError:
+        else:
            result = self._fn()
            setattr(self, self.result_key, result)
            return result
--- a/samples/openapi3/client/petstore/python-experimental/README.md
+++ b/samples/openapi3/client/petstore/python-experimental/README.md
@@ -50,7 +50,7 @@ import time
 import petstore_api
 from pprint import pprint
 from petstore_api.api import another_fake_api
-from petstore_api.model import client
+from petstore_api.model.client import Client
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
 configuration = petstore_api.Configuration(
@@ -63,11 +63,11 @@ configuration = petstore_api.Configuration(
 with petstore_api.ApiClient(configuration) as api_client:
    # Create an instance of the API class
    api_instance = another_fake_api.AnotherFakeApi(api_client)
-    client_client = client.Client() # client.Client | client model
+    client = Client() # Client | client model

    try:
        # To test special tags
-        api_response = api_instance.call_123_test_special_tags(client_client)
+        api_response = api_instance.call_123_test_special_tags(client)
        pprint(api_response)
    except petstore_api.ApiException as e:
        print("Exception when calling AnotherFakeApi->call_123_test_special_tags: %s\n" % e)
@@ -126,94 +126,94 @@ Class | Method | HTTP request | Description

 ## Documentation For Models

- - [additional_properties_class.AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
- - [additional_properties_with_array_of_enums.AdditionalPropertiesWithArrayOfEnums](docs/AdditionalPropertiesWithArrayOfEnums.md)
- - [address.Address](docs/Address.md)
- - [animal.Animal](docs/Animal.md)
- - [animal_farm.AnimalFarm](docs/AnimalFarm.md)
- - [api_response.ApiResponse](docs/ApiResponse.md)
- - [apple.Apple](docs/Apple.md)
- - [apple_req.AppleReq](docs/AppleReq.md)
- - [array_of_array_of_number_only.ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
- - [array_of_enums.ArrayOfEnums](docs/ArrayOfEnums.md)
- - [array_of_number_only.ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
- - [array_test.ArrayTest](docs/ArrayTest.md)
- - [banana.Banana](docs/Banana.md)
- - [banana_req.BananaReq](docs/BananaReq.md)
- - [basque_pig.BasquePig](docs/BasquePig.md)
- - [capitalization.Capitalization](docs/Capitalization.md)
- - [cat.Cat](docs/Cat.md)
- - [cat_all_of.CatAllOf](docs/CatAllOf.md)
- - [category.Category](docs/Category.md)
- - [child_cat.ChildCat](docs/ChildCat.md)
- - [child_cat_all_of.ChildCatAllOf](docs/ChildCatAllOf.md)
- - [class_model.ClassModel](docs/ClassModel.md)
- - [client.Client](docs/Client.md)
- - [complex_quadrilateral.ComplexQuadrilateral](docs/ComplexQuadrilateral.md)
- - [composed_one_of_number_with_validations.ComposedOneOfNumberWithValidations](docs/ComposedOneOfNumberWithValidations.md)
- - [danish_pig.DanishPig](docs/DanishPig.md)
- - [dog.Dog](docs/Dog.md)
- - [dog_all_of.DogAllOf](docs/DogAllOf.md)
- - [drawing.Drawing](docs/Drawing.md)
- - [enum_arrays.EnumArrays](docs/EnumArrays.md)
- - [enum_class.EnumClass](docs/EnumClass.md)
- - [enum_test.EnumTest](docs/EnumTest.md)
- - [equilateral_triangle.EquilateralTriangle](docs/EquilateralTriangle.md)
- - [file.File](docs/File.md)
- - [file_schema_test_class.FileSchemaTestClass](docs/FileSchemaTestClass.md)
- - [foo.Foo](docs/Foo.md)
- - [format_test.FormatTest](docs/FormatTest.md)
- - [fruit.Fruit](docs/Fruit.md)
- - [fruit_req.FruitReq](docs/FruitReq.md)
- - [gm_fruit.GmFruit](docs/GmFruit.md)
- - [grandparent_animal.GrandparentAnimal](docs/GrandparentAnimal.md)
- - [has_only_read_only.HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
- - [health_check_result.HealthCheckResult](docs/HealthCheckResult.md)
- - [inline_object.InlineObject](docs/InlineObject.md)
- - [inline_object1.InlineObject1](docs/InlineObject1.md)
- - [inline_object2.InlineObject2](docs/InlineObject2.md)
- - [inline_object3.InlineObject3](docs/InlineObject3.md)
- - [inline_object4.InlineObject4](docs/InlineObject4.md)
- - [inline_object5.InlineObject5](docs/InlineObject5.md)
- - [inline_response_default.InlineResponseDefault](docs/InlineResponseDefault.md)
- - [integer_enum.IntegerEnum](docs/IntegerEnum.md)
- - [integer_enum_one_value.IntegerEnumOneValue](docs/IntegerEnumOneValue.md)
- - [integer_enum_with_default_value.IntegerEnumWithDefaultValue](docs/IntegerEnumWithDefaultValue.md)
- - [isosceles_triangle.IsoscelesTriangle](docs/IsoscelesTriangle.md)
- - [list.List](docs/List.md)
- - [mammal.Mammal](docs/Mammal.md)
- - [map_test.MapTest](docs/MapTest.md)
- - [mixed_properties_and_additional_properties_class.MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md)
- - [model200_response.Model200Response](docs/Model200Response.md)
- - [model_return.ModelReturn](docs/ModelReturn.md)
- - [name.Name](docs/Name.md)
- - [nullable_class.NullableClass](docs/NullableClass.md)
- - [nullable_shape.NullableShape](docs/NullableShape.md)
- - [number_only.NumberOnly](docs/NumberOnly.md)
- - [number_with_validations.NumberWithValidations](docs/NumberWithValidations.md)
- - [object_model_with_ref_props.ObjectModelWithRefProps](docs/ObjectModelWithRefProps.md)
- - [order.Order](docs/Order.md)
- - [parent_pet.ParentPet](docs/ParentPet.md)
- - [pet.Pet](docs/Pet.md)
- - [pig.Pig](docs/Pig.md)
- - [quadrilateral.Quadrilateral](docs/Quadrilateral.md)
- - [quadrilateral_interface.QuadrilateralInterface](docs/QuadrilateralInterface.md)
- - [read_only_first.ReadOnlyFirst](docs/ReadOnlyFirst.md)
- - [scalene_triangle.ScaleneTriangle](docs/ScaleneTriangle.md)
- - [shape.Shape](docs/Shape.md)
- - [shape_interface.ShapeInterface](docs/ShapeInterface.md)
- - [shape_or_null.ShapeOrNull](docs/ShapeOrNull.md)
- - [simple_quadrilateral.SimpleQuadrilateral](docs/SimpleQuadrilateral.md)
- - [special_model_name.SpecialModelName](docs/SpecialModelName.md)
- - [string_boolean_map.StringBooleanMap](docs/StringBooleanMap.md)
- - [string_enum.StringEnum](docs/StringEnum.md)
- - [string_enum_with_default_value.StringEnumWithDefaultValue](docs/StringEnumWithDefaultValue.md)
- - [tag.Tag](docs/Tag.md)
- - [triangle.Triangle](docs/Triangle.md)
- - [triangle_interface.TriangleInterface](docs/TriangleInterface.md)
- - [user.User](docs/User.md)
- - [whale.Whale](docs/Whale.md)
- - [zebra.Zebra](docs/Zebra.md)
+ - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
+ - [AdditionalPropertiesWithArrayOfEnums](docs/AdditionalPropertiesWithArrayOfEnums.md)
+ - [Address](docs/Address.md)
+ - [Animal](docs/Animal.md)
+ - [AnimalFarm](docs/AnimalFarm.md)
+ - [ApiResponse](docs/ApiResponse.md)
+ - [Apple](docs/Apple.md)
+ - [AppleReq](docs/AppleReq.md)
+ - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
+ - [ArrayOfEnums](docs/ArrayOfEnums.md)
+ - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
+ - [ArrayTest](docs/ArrayTest.md)
+ - [Banana](docs/Banana.md)
+ - [BananaReq](docs/BananaReq.md)
+ - [BasquePig](docs/BasquePig.md)
+ - [Capitalization](docs/Capitalization.md)
+ - [Cat](docs/Cat.md)
+ - [CatAllOf](docs/CatAllOf.md)
+ - [Category](docs/Category.md)
+ - [ChildCat](docs/ChildCat.md)
+ - [ChildCatAllOf](docs/ChildCatAllOf.md)
+ - [ClassModel](docs/ClassModel.md)
+ - [Client](docs/Client.md)
+ - [ComplexQuadrilateral](docs/ComplexQuadrilateral.md)
+ - [ComposedOneOfNumberWithValidations](docs/ComposedOneOfNumberWithValidations.md)
+ - [DanishPig](docs/DanishPig.md)
+ - [Dog](docs/Dog.md)
+ - [DogAllOf](docs/DogAllOf.md)
+ - [Drawing](docs/Drawing.md)
+ - [EnumArrays](docs/EnumArrays.md)
+ - [EnumClass](docs/EnumClass.md)
+ - [EnumTest](docs/EnumTest.md)
+ - [EquilateralTriangle](docs/EquilateralTriangle.md)
+ - [File](docs/File.md)
+ - [FileSchemaTestClass](docs/FileSchemaTestClass.md)
+ - [Foo](docs/Foo.md)
+ - [FormatTest](docs/FormatTest.md)
+ - [Fruit](docs/Fruit.md)
+ - [FruitReq](docs/FruitReq.md)
+ - [GmFruit](docs/GmFruit.md)
+ - [GrandparentAnimal](docs/GrandparentAnimal.md)
+ - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
+ - [HealthCheckResult](docs/HealthCheckResult.md)
+ - [InlineObject](docs/InlineObject.md)
+ - [InlineObject1](docs/InlineObject1.md)
+ - [InlineObject2](docs/InlineObject2.md)
+ - [InlineObject3](docs/InlineObject3.md)
+ - [InlineObject4](docs/InlineObject4.md)
+ - [InlineObject5](docs/InlineObject5.md)
+ - [InlineResponseDefault](docs/InlineResponseDefault.md)
+ - [IntegerEnum](docs/IntegerEnum.md)
+ - [IntegerEnumOneValue](docs/IntegerEnumOneValue.md)
+ - [IntegerEnumWithDefaultValue](docs/IntegerEnumWithDefaultValue.md)
+ - [IsoscelesTriangle](docs/IsoscelesTriangle.md)
+ - [List](docs/List.md)
+ - [Mammal](docs/Mammal.md)
+ - [MapTest](docs/MapTest.md)
+ - [MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md)
+ - [Model200Response](docs/Model200Response.md)
+ - [ModelReturn](docs/ModelReturn.md)
+ - [Name](docs/Name.md)
+ - [NullableClass](docs/NullableClass.md)
+ - [NullableShape](docs/NullableShape.md)
+ - [NumberOnly](docs/NumberOnly.md)
+ - [NumberWithValidations](docs/NumberWithValidations.md)
+ - [ObjectModelWithRefProps](docs/ObjectModelWithRefProps.md)
+ - [Order](docs/Order.md)
+ - [ParentPet](docs/ParentPet.md)
+ - [Pet](docs/Pet.md)
+ - [Pig](docs/Pig.md)
+ - [Quadrilateral](docs/Quadrilateral.md)
+ - [QuadrilateralInterface](docs/QuadrilateralInterface.md)
+ - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
+ - [ScaleneTriangle](docs/ScaleneTriangle.md)
+ - [Shape](docs/Shape.md)
+ - [ShapeInterface](docs/ShapeInterface.md)
+ - [ShapeOrNull](docs/ShapeOrNull.md)
+ - [SimpleQuadrilateral](docs/SimpleQuadrilateral.md)
+ - [SpecialModelName](docs/SpecialModelName.md)
+ - [StringBooleanMap](docs/StringBooleanMap.md)
+ - [StringEnum](docs/StringEnum.md)
+ - [StringEnumWithDefaultValue](docs/StringEnumWithDefaultValue.md)
+ - [Tag](docs/Tag.md)
+ - [Triangle](docs/Triangle.md)
+ - [TriangleInterface](docs/TriangleInterface.md)
+ - [User](docs/User.md)
+ - [Whale](docs/Whale.md)
+ - [Zebra](docs/Zebra.md)


 ## Documentation For Authorization
--- a/samples/openapi3/client/petstore/python-experimental/docs/AdditionalPropertiesClass.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/AdditionalPropertiesClass.md
@@ -1,4 +1,4 @@
-# additional_properties_class.AdditionalPropertiesClass
+# AdditionalPropertiesClass

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/AdditionalPropertiesWithArrayOfEnums.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/AdditionalPropertiesWithArrayOfEnums.md
@@ -1,9 +1,9 @@
-# additional_properties_with_array_of_enums.AdditionalPropertiesWithArrayOfEnums
+# AdditionalPropertiesWithArrayOfEnums

 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**any string name** | **[enum_class.EnumClass]** | any string name can be used but the value must be the correct type | [optional]
+**any string name** | **[EnumClass]** | any string name can be used but the value must be the correct type | [optional]

 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

--- a/samples/openapi3/client/petstore/python-experimental/docs/Address.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/Address.md
@@ -1,4 +1,4 @@
-# address.Address
+# Address

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/Animal.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/Animal.md
@@ -1,4 +1,4 @@
-# animal.Animal
+# Animal

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/AnimalFarm.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/AnimalFarm.md
@@ -1,9 +1,9 @@
-# animal_farm.AnimalFarm
+# AnimalFarm

 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**value** | [**[animal.Animal]**](Animal.md) |  | 
+**value** | [**[Animal]**](Animal.md) |  | 

 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

--- a/samples/openapi3/client/petstore/python-experimental/docs/AnotherFakeApi.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/AnotherFakeApi.md
@@ -8,7 +8,7 @@ Method | HTTP request | Description


 # **call_123_test_special_tags**
-> client.Client call_123_test_special_tags(client_client)
+> Client call_123_test_special_tags(client)

 To test special tags

@@ -20,7 +20,7 @@ To test special tags and operation ID starting with number
 import time
 import petstore_api
 from petstore_api.api import another_fake_api
-from petstore_api.model import client
+from petstore_api.model.client import Client
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -33,12 +33,12 @@ configuration = petstore_api.Configuration(
 with petstore_api.ApiClient() as api_client:
    # Create an instance of the API class
    api_instance = another_fake_api.AnotherFakeApi(api_client)
-    client_client = client.Client() # client.Client | client model
+    client = Client() # Client | client model
    
    # example passing only required values which don't have defaults set
    try:
        # To test special tags
-        api_response = api_instance.call_123_test_special_tags(client_client)
+        api_response = api_instance.call_123_test_special_tags(client)
        pprint(api_response)
    except petstore_api.ApiException as e:
        print("Exception when calling AnotherFakeApi->call_123_test_special_tags: %s\n" % e)
@@ -48,11 +48,11 @@ with petstore_api.ApiClient() as api_client:

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **client_client** | [**client.Client**](Client.md)| client model |
+ **client** | [**Client**](Client.md)| client model |

 ### Return type

-[**client.Client**](Client.md)
+[**Client**](Client.md)

 ### Authorization

--- a/samples/openapi3/client/petstore/python-experimental/docs/ApiResponse.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/ApiResponse.md
@@ -1,4 +1,4 @@
-# api_response.ApiResponse
+# ApiResponse

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/Apple.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/Apple.md
@@ -1,4 +1,4 @@
-# apple.Apple
+# Apple

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/AppleReq.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/AppleReq.md
@@ -1,4 +1,4 @@
-# apple_req.AppleReq
+# AppleReq

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/ArrayOfArrayOfNumberOnly.md
@@ -1,4 +1,4 @@
-# array_of_array_of_number_only.ArrayOfArrayOfNumberOnly
+# ArrayOfArrayOfNumberOnly

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/ArrayOfEnums.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/ArrayOfEnums.md
@@ -1,9 +1,9 @@
-# array_of_enums.ArrayOfEnums
+# ArrayOfEnums

 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**value** | [**[string_enum.StringEnum, none_type]**](StringEnum.md) |  | 
+**value** | [**[StringEnum]**](StringEnum.md) |  | 

 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

--- a/samples/openapi3/client/petstore/python-experimental/docs/ArrayOfNumberOnly.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/ArrayOfNumberOnly.md
@@ -1,4 +1,4 @@
-# array_of_number_only.ArrayOfNumberOnly
+# ArrayOfNumberOnly

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/ArrayTest.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/ArrayTest.md
@@ -1,11 +1,11 @@
-# array_test.ArrayTest
+# ArrayTest

 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **array_of_string** | **[str]** |  | [optional] 
 **array_array_of_integer** | **[[int]]** |  | [optional] 
-**array_array_of_model** | [**[[read_only_first.ReadOnlyFirst]]**](ReadOnlyFirst.md) |  | [optional] 
+**array_array_of_model** | [**[[ReadOnlyFirst]]**](ReadOnlyFirst.md) |  | [optional] 

 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

--- a/samples/openapi3/client/petstore/python-experimental/docs/Banana.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/Banana.md
@@ -1,4 +1,4 @@
-# banana.Banana
+# Banana

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/BananaReq.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/BananaReq.md
@@ -1,4 +1,4 @@
-# banana_req.BananaReq
+# BananaReq

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/BasquePig.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/BasquePig.md
@@ -1,4 +1,4 @@
-# basque_pig.BasquePig
+# BasquePig

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/Capitalization.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/Capitalization.md
@@ -1,4 +1,4 @@
-# capitalization.Capitalization
+# Capitalization

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/Cat.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/Cat.md
@@ -1,4 +1,4 @@
-# cat.Cat
+# Cat

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/CatAllOf.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/CatAllOf.md
@@ -1,4 +1,4 @@
-# cat_all_of.CatAllOf
+# CatAllOf

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/Category.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/Category.md
@@ -1,4 +1,4 @@
-# category.Category
+# Category

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/ChildCat.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/ChildCat.md
@@ -1,4 +1,4 @@
-# child_cat.ChildCat
+# ChildCat

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/ChildCatAllOf.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/ChildCatAllOf.md
@@ -1,4 +1,4 @@
-# child_cat_all_of.ChildCatAllOf
+# ChildCatAllOf

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/ClassModel.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/ClassModel.md
@@ -1,4 +1,4 @@
-# class_model.ClassModel
+# ClassModel

 Model for testing model with \"_class\" property
 ## Properties
--- a/samples/openapi3/client/petstore/python-experimental/docs/Client.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/Client.md
@@ -1,4 +1,4 @@
-# client.Client
+# Client

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/ComplexQuadrilateral.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/ComplexQuadrilateral.md
@@ -1,4 +1,4 @@
-# complex_quadrilateral.ComplexQuadrilateral
+# ComplexQuadrilateral

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/ComposedOneOfNumberWithValidations.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/ComposedOneOfNumberWithValidations.md
@@ -1,4 +1,4 @@
-# composed_one_of_number_with_validations.ComposedOneOfNumberWithValidations
+# ComposedOneOfNumberWithValidations

 this is a model that allows payloads of type object or number
 ## Properties
--- a/samples/openapi3/client/petstore/python-experimental/docs/DanishPig.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/DanishPig.md
@@ -1,4 +1,4 @@
-# danish_pig.DanishPig
+# DanishPig

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/DefaultApi.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/DefaultApi.md
@@ -8,7 +8,7 @@ Method | HTTP request | Description


 # **foo_get**
-> inline_response_default.InlineResponseDefault foo_get()
+> InlineResponseDefault foo_get()



@@ -18,7 +18,7 @@ Method | HTTP request | Description
 import time
 import petstore_api
 from petstore_api.api import default_api
-from petstore_api.model import inline_response_default
+from petstore_api.model.inline_response_default import InlineResponseDefault
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -45,7 +45,7 @@ This endpoint does not need any parameter.

 ### Return type

-[**inline_response_default.InlineResponseDefault**](InlineResponseDefault.md)
+[**InlineResponseDefault**](InlineResponseDefault.md)

 ### Authorization

--- a/samples/openapi3/client/petstore/python-experimental/docs/Dog.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/Dog.md
@@ -1,4 +1,4 @@
-# dog.Dog
+# Dog

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/DogAllOf.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/DogAllOf.md
@@ -1,4 +1,4 @@
-# dog_all_of.DogAllOf
+# DogAllOf

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/Drawing.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/Drawing.md
@@ -1,13 +1,13 @@
-# drawing.Drawing
+# Drawing

 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**main_shape** | [**shape.Shape**](Shape.md) |  | [optional] 
-**shape_or_null** | [**shape_or_null.ShapeOrNull**](ShapeOrNull.md) |  | [optional] 
-**nullable_shape** | [**nullable_shape.NullableShape**](NullableShape.md) |  | [optional] 
-**shapes** | [**[shape.Shape]**](Shape.md) |  | [optional] 
-**any string name** | **fruit.Fruit** | any string name can be used but the value must be the correct type | [optional]
+**main_shape** | [**Shape**](Shape.md) |  | [optional] 
+**shape_or_null** | [**ShapeOrNull**](ShapeOrNull.md) |  | [optional] 
+**nullable_shape** | [**NullableShape**](NullableShape.md) |  | [optional] 
+**shapes** | [**[Shape]**](Shape.md) |  | [optional] 
+**any string name** | **Fruit** | any string name can be used but the value must be the correct type | [optional]

 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

--- a/samples/openapi3/client/petstore/python-experimental/docs/EnumArrays.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/EnumArrays.md
@@ -1,4 +1,4 @@
-# enum_arrays.EnumArrays
+# EnumArrays

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/EnumClass.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/EnumClass.md
@@ -1,4 +1,4 @@
-# enum_class.EnumClass
+# EnumClass

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/EnumTest.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/EnumTest.md
@@ -1,4 +1,4 @@
-# enum_test.EnumTest
+# EnumTest

 ## Properties
 Name | Type | Description | Notes
@@ -7,11 +7,11 @@ Name | Type | Description | Notes
 **enum_string** | **str** |  | [optional] 
 **enum_integer** | **int** |  | [optional] 
 **enum_number** | **float** |  | [optional] 
-**string_enum** | [**string_enum.StringEnum, none_type**](StringEnum.md) |  | [optional] 
-**integer_enum** | [**integer_enum.IntegerEnum**](IntegerEnum.md) |  | [optional] 
-**string_enum_with_default_value** | [**string_enum_with_default_value.StringEnumWithDefaultValue**](StringEnumWithDefaultValue.md) |  | [optional] 
-**integer_enum_with_default_value** | [**integer_enum_with_default_value.IntegerEnumWithDefaultValue**](IntegerEnumWithDefaultValue.md) |  | [optional] 
-**integer_enum_one_value** | [**integer_enum_one_value.IntegerEnumOneValue**](IntegerEnumOneValue.md) |  | [optional] 
+**string_enum** | [**StringEnum**](StringEnum.md) |  | [optional] 
+**integer_enum** | [**IntegerEnum**](IntegerEnum.md) |  | [optional] 
+**string_enum_with_default_value** | [**StringEnumWithDefaultValue**](StringEnumWithDefaultValue.md) |  | [optional] 
+**integer_enum_with_default_value** | [**IntegerEnumWithDefaultValue**](IntegerEnumWithDefaultValue.md) |  | [optional] 
+**integer_enum_one_value** | [**IntegerEnumOneValue**](IntegerEnumOneValue.md) |  | [optional] 

 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

--- a/samples/openapi3/client/petstore/python-experimental/docs/EquilateralTriangle.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/EquilateralTriangle.md
@@ -1,4 +1,4 @@
-# equilateral_triangle.EquilateralTriangle
+# EquilateralTriangle

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/FakeApi.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/FakeApi.md
@@ -26,7 +26,7 @@ Method | HTTP request | Description


 # **additional_properties_with_array_of_enums**
-> additional_properties_with_array_of_enums.AdditionalPropertiesWithArrayOfEnums additional_properties_with_array_of_enums()
+> AdditionalPropertiesWithArrayOfEnums additional_properties_with_array_of_enums()

 Additional Properties with Array of Enums

@@ -36,7 +36,7 @@ Additional Properties with Array of Enums
 import time
 import petstore_api
 from petstore_api.api import fake_api
-from petstore_api.model import additional_properties_with_array_of_enums
+from petstore_api.model.additional_properties_with_array_of_enums import AdditionalPropertiesWithArrayOfEnums
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -49,13 +49,13 @@ configuration = petstore_api.Configuration(
 with petstore_api.ApiClient() as api_client:
    # Create an instance of the API class
    api_instance = fake_api.FakeApi(api_client)
-    additional_properties_with_array_of_enums_additional_properties_with_array_of_enums = additional_properties_with_array_of_enums.AdditionalPropertiesWithArrayOfEnums() # additional_properties_with_array_of_enums.AdditionalPropertiesWithArrayOfEnums | Input enum (optional)
+    additional_properties_with_array_of_enums = AdditionalPropertiesWithArrayOfEnums() # AdditionalPropertiesWithArrayOfEnums | Input enum (optional)

    # example passing only required values which don't have defaults set
    # and optional values
    try:
        # Additional Properties with Array of Enums
-        api_response = api_instance.additional_properties_with_array_of_enums(additional_properties_with_array_of_enums_additional_properties_with_array_of_enums=additional_properties_with_array_of_enums_additional_properties_with_array_of_enums)
+        api_response = api_instance.additional_properties_with_array_of_enums(additional_properties_with_array_of_enums=additional_properties_with_array_of_enums)
        pprint(api_response)
    except petstore_api.ApiException as e:
        print("Exception when calling FakeApi->additional_properties_with_array_of_enums: %s\n" % e)
@@ -65,11 +65,11 @@ with petstore_api.ApiClient() as api_client:

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **additional_properties_with_array_of_enums_additional_properties_with_array_of_enums** | [**additional_properties_with_array_of_enums.AdditionalPropertiesWithArrayOfEnums**](AdditionalPropertiesWithArrayOfEnums.md)| Input enum | [optional]
+ **additional_properties_with_array_of_enums** | [**AdditionalPropertiesWithArrayOfEnums**](AdditionalPropertiesWithArrayOfEnums.md)| Input enum | [optional]

 ### Return type

-[**additional_properties_with_array_of_enums.AdditionalPropertiesWithArrayOfEnums**](AdditionalPropertiesWithArrayOfEnums.md)
+[**AdditionalPropertiesWithArrayOfEnums**](AdditionalPropertiesWithArrayOfEnums.md)

 ### Authorization

@@ -88,7 +88,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)

 # **array_model**
-> animal_farm.AnimalFarm array_model()
+> AnimalFarm array_model()



@@ -100,7 +100,7 @@ Test serialization of ArrayModel
 import time
 import petstore_api
 from petstore_api.api import fake_api
-from petstore_api.model import animal_farm
+from petstore_api.model.animal_farm import AnimalFarm
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -113,7 +113,7 @@ configuration = petstore_api.Configuration(
 with petstore_api.ApiClient() as api_client:
    # Create an instance of the API class
    api_instance = fake_api.FakeApi(api_client)
-    body = animal_farm.AnimalFarm() # animal_farm.AnimalFarm | Input model (optional)
+    body = AnimalFarm() # AnimalFarm | Input model (optional)

    # example passing only required values which don't have defaults set
    # and optional values
@@ -128,11 +128,11 @@ with petstore_api.ApiClient() as api_client:

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**animal_farm.AnimalFarm**](AnimalFarm.md)| Input model | [optional]
+ **body** | [**AnimalFarm**](AnimalFarm.md)| Input model | [optional]

 ### Return type

-[**animal_farm.AnimalFarm**](AnimalFarm.md)
+[**AnimalFarm**](AnimalFarm.md)

 ### Authorization

@@ -151,7 +151,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)

 # **array_of_enums**
-> array_of_enums.ArrayOfEnums array_of_enums()
+> ArrayOfEnums array_of_enums()

 Array of Enums

@@ -161,7 +161,7 @@ Array of Enums
 import time
 import petstore_api
 from petstore_api.api import fake_api
-from petstore_api.model import array_of_enums
+from petstore_api.model.array_of_enums import ArrayOfEnums
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -174,13 +174,13 @@ configuration = petstore_api.Configuration(
 with petstore_api.ApiClient() as api_client:
    # Create an instance of the API class
    api_instance = fake_api.FakeApi(api_client)
-    array_of_enums_array_of_enums = array_of_enums.ArrayOfEnums() # array_of_enums.ArrayOfEnums | Input enum (optional)
+    array_of_enums = ArrayOfEnums() # ArrayOfEnums | Input enum (optional)

    # example passing only required values which don't have defaults set
    # and optional values
    try:
        # Array of Enums
-        api_response = api_instance.array_of_enums(array_of_enums_array_of_enums=array_of_enums_array_of_enums)
+        api_response = api_instance.array_of_enums(array_of_enums=array_of_enums)
        pprint(api_response)
    except petstore_api.ApiException as e:
        print("Exception when calling FakeApi->array_of_enums: %s\n" % e)
@@ -190,11 +190,11 @@ with petstore_api.ApiClient() as api_client:

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **array_of_enums_array_of_enums** | [**array_of_enums.ArrayOfEnums**](ArrayOfEnums.md)| Input enum | [optional]
+ **array_of_enums** | [**ArrayOfEnums**](ArrayOfEnums.md)| Input enum | [optional]

 ### Return type

-[**array_of_enums.ArrayOfEnums**](ArrayOfEnums.md)
+[**ArrayOfEnums**](ArrayOfEnums.md)

 ### Authorization

@@ -275,7 +275,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)

 # **composed_one_of_number_with_validations**
-> composed_one_of_number_with_validations.ComposedOneOfNumberWithValidations composed_one_of_number_with_validations()
+> ComposedOneOfNumberWithValidations composed_one_of_number_with_validations()



@@ -287,7 +287,7 @@ Test serialization of object with $refed properties
 import time
 import petstore_api
 from petstore_api.api import fake_api
-from petstore_api.model import composed_one_of_number_with_validations
+from petstore_api.model.composed_one_of_number_with_validations import ComposedOneOfNumberWithValidations
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -300,12 +300,12 @@ configuration = petstore_api.Configuration(
 with petstore_api.ApiClient() as api_client:
    # Create an instance of the API class
    api_instance = fake_api.FakeApi(api_client)
-    composed_one_of_number_with_validations_composed_one_of_number_with_validations = composed_one_of_number_with_validations.ComposedOneOfNumberWithValidations() # composed_one_of_number_with_validations.ComposedOneOfNumberWithValidations | Input model (optional)
+    composed_one_of_number_with_validations = ComposedOneOfNumberWithValidations() # ComposedOneOfNumberWithValidations | Input model (optional)

    # example passing only required values which don't have defaults set
    # and optional values
    try:
-        api_response = api_instance.composed_one_of_number_with_validations(composed_one_of_number_with_validations_composed_one_of_number_with_validations=composed_one_of_number_with_validations_composed_one_of_number_with_validations)
+        api_response = api_instance.composed_one_of_number_with_validations(composed_one_of_number_with_validations=composed_one_of_number_with_validations)
        pprint(api_response)
    except petstore_api.ApiException as e:
        print("Exception when calling FakeApi->composed_one_of_number_with_validations: %s\n" % e)
@@ -315,11 +315,11 @@ with petstore_api.ApiClient() as api_client:

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **composed_one_of_number_with_validations_composed_one_of_number_with_validations** | [**composed_one_of_number_with_validations.ComposedOneOfNumberWithValidations**](ComposedOneOfNumberWithValidations.md)| Input model | [optional]
+ **composed_one_of_number_with_validations** | [**ComposedOneOfNumberWithValidations**](ComposedOneOfNumberWithValidations.md)| Input model | [optional]

 ### Return type

-[**composed_one_of_number_with_validations.ComposedOneOfNumberWithValidations**](ComposedOneOfNumberWithValidations.md)
+[**ComposedOneOfNumberWithValidations**](ComposedOneOfNumberWithValidations.md)

 ### Authorization

@@ -338,7 +338,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)

 # **fake_health_get**
-> health_check_result.HealthCheckResult fake_health_get()
+> HealthCheckResult fake_health_get()

 Health check endpoint

@@ -348,7 +348,7 @@ Health check endpoint
 import time
 import petstore_api
 from petstore_api.api import fake_api
-from petstore_api.model import health_check_result
+from petstore_api.model.health_check_result import HealthCheckResult
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -376,7 +376,7 @@ This endpoint does not need any parameter.

 ### Return type

-[**health_check_result.HealthCheckResult**](HealthCheckResult.md)
+[**HealthCheckResult**](HealthCheckResult.md)

 ### Authorization

@@ -395,7 +395,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)

 # **number_with_validations**
-> number_with_validations.NumberWithValidations number_with_validations()
+> NumberWithValidations number_with_validations()



@@ -407,7 +407,7 @@ Test serialization of outer number types
 import time
 import petstore_api
 from petstore_api.api import fake_api
-from petstore_api.model import number_with_validations
+from petstore_api.model.number_with_validations import NumberWithValidations
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -420,7 +420,7 @@ configuration = petstore_api.Configuration(
 with petstore_api.ApiClient() as api_client:
    # Create an instance of the API class
    api_instance = fake_api.FakeApi(api_client)
-    body = number_with_validations.NumberWithValidations(3.4) # number_with_validations.NumberWithValidations | Input number as post body (optional)
+    body = NumberWithValidations(3.4) # NumberWithValidations | Input number as post body (optional)

    # example passing only required values which don't have defaults set
    # and optional values
@@ -435,11 +435,11 @@ with petstore_api.ApiClient() as api_client:

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**number_with_validations.NumberWithValidations**](NumberWithValidations.md)| Input number as post body | [optional]
+ **body** | [**NumberWithValidations**](NumberWithValidations.md)| Input number as post body | [optional]

 ### Return type

-[**number_with_validations.NumberWithValidations**](NumberWithValidations.md)
+[**NumberWithValidations**](NumberWithValidations.md)

 ### Authorization

@@ -458,7 +458,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)

 # **object_model_with_ref_props**
-> object_model_with_ref_props.ObjectModelWithRefProps object_model_with_ref_props()
+> ObjectModelWithRefProps object_model_with_ref_props()



@@ -470,7 +470,7 @@ Test serialization of object with $refed properties
 import time
 import petstore_api
 from petstore_api.api import fake_api
-from petstore_api.model import object_model_with_ref_props
+from petstore_api.model.object_model_with_ref_props import ObjectModelWithRefProps
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -483,7 +483,7 @@ configuration = petstore_api.Configuration(
 with petstore_api.ApiClient() as api_client:
    # Create an instance of the API class
    api_instance = fake_api.FakeApi(api_client)
-    body = object_model_with_ref_props.ObjectModelWithRefProps() # object_model_with_ref_props.ObjectModelWithRefProps | Input model (optional)
+    body = ObjectModelWithRefProps() # ObjectModelWithRefProps | Input model (optional)

    # example passing only required values which don't have defaults set
    # and optional values
@@ -498,11 +498,11 @@ with petstore_api.ApiClient() as api_client:

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**object_model_with_ref_props.ObjectModelWithRefProps**](ObjectModelWithRefProps.md)| Input model | [optional]
+ **body** | [**ObjectModelWithRefProps**](ObjectModelWithRefProps.md)| Input model | [optional]

 ### Return type

-[**object_model_with_ref_props.ObjectModelWithRefProps**](ObjectModelWithRefProps.md)
+[**ObjectModelWithRefProps**](ObjectModelWithRefProps.md)

 ### Authorization

@@ -583,7 +583,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)

 # **string_enum**
-> string_enum.StringEnum string_enum()
+> StringEnum string_enum()



@@ -595,7 +595,7 @@ Test serialization of outer enum
 import time
 import petstore_api
 from petstore_api.api import fake_api
-from petstore_api.model import string_enum
+from petstore_api.model.string_enum import StringEnum
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -608,7 +608,7 @@ configuration = petstore_api.Configuration(
 with petstore_api.ApiClient() as api_client:
    # Create an instance of the API class
    api_instance = fake_api.FakeApi(api_client)
-    body = string_enum.StringEnum("placed") # string_enum.StringEnum | Input enum (optional)
+    body = StringEnum("placed") # StringEnum | Input enum (optional)

    # example passing only required values which don't have defaults set
    # and optional values
@@ -623,11 +623,11 @@ with petstore_api.ApiClient() as api_client:

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**string_enum.StringEnum**](StringEnum.md)| Input enum | [optional]
+ **body** | [**StringEnum**](StringEnum.md)| Input enum | [optional]

 ### Return type

-[**string_enum.StringEnum**](StringEnum.md)
+[**StringEnum**](StringEnum.md)

 ### Authorization

@@ -646,7 +646,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)

 # **test_body_with_file_schema**
-> test_body_with_file_schema(file_schema_test_class_file_schema_test_class)
+> test_body_with_file_schema(file_schema_test_class)



@@ -658,7 +658,7 @@ For this test, the body for this request much reference a schema named `File`.
 import time
 import petstore_api
 from petstore_api.api import fake_api
-from petstore_api.model import file_schema_test_class
+from petstore_api.model.file_schema_test_class import FileSchemaTestClass
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -671,11 +671,11 @@ configuration = petstore_api.Configuration(
 with petstore_api.ApiClient() as api_client:
    # Create an instance of the API class
    api_instance = fake_api.FakeApi(api_client)
-    file_schema_test_class_file_schema_test_class = file_schema_test_class.FileSchemaTestClass() # file_schema_test_class.FileSchemaTestClass | 
+    file_schema_test_class = FileSchemaTestClass() # FileSchemaTestClass | 
    
    # example passing only required values which don't have defaults set
    try:
-        api_instance.test_body_with_file_schema(file_schema_test_class_file_schema_test_class)
+        api_instance.test_body_with_file_schema(file_schema_test_class)
    except petstore_api.ApiException as e:
        print("Exception when calling FakeApi->test_body_with_file_schema: %s\n" % e)
 ```
@@ -684,7 +684,7 @@ with petstore_api.ApiClient() as api_client:

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **file_schema_test_class_file_schema_test_class** | [**file_schema_test_class.FileSchemaTestClass**](FileSchemaTestClass.md)|  |
+ **file_schema_test_class** | [**FileSchemaTestClass**](FileSchemaTestClass.md)|  |

 ### Return type

@@ -707,7 +707,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)

 # **test_body_with_query_params**
-> test_body_with_query_params(query, user_user)
+> test_body_with_query_params(query, user)



@@ -717,7 +717,7 @@ No authorization required
 import time
 import petstore_api
 from petstore_api.api import fake_api
-from petstore_api.model import user
+from petstore_api.model.user import User
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -731,11 +731,11 @@ with petstore_api.ApiClient() as api_client:
    # Create an instance of the API class
    api_instance = fake_api.FakeApi(api_client)
    query = 'query_example' # str | 
-    user_user = user.User() # user.User | 
+    user = User() # User | 
    
    # example passing only required values which don't have defaults set
    try:
-        api_instance.test_body_with_query_params(query, user_user)
+        api_instance.test_body_with_query_params(query, user)
    except petstore_api.ApiException as e:
        print("Exception when calling FakeApi->test_body_with_query_params: %s\n" % e)
 ```
@@ -745,7 +745,7 @@ with petstore_api.ApiClient() as api_client:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 **query** | **str**|  |
- **user_user** | [**user.User**](User.md)|  |
+ **user** | [**User**](User.md)|  |

 ### Return type

@@ -768,7 +768,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)

 # **test_client_model**
-> client.Client test_client_model(client_client)
+> Client test_client_model(client)

 To test \"client\" model

@@ -780,7 +780,7 @@ To test \"client\" model
 import time
 import petstore_api
 from petstore_api.api import fake_api
-from petstore_api.model import client
+from petstore_api.model.client import Client
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -793,12 +793,12 @@ configuration = petstore_api.Configuration(
 with petstore_api.ApiClient() as api_client:
    # Create an instance of the API class
    api_instance = fake_api.FakeApi(api_client)
-    client_client = client.Client() # client.Client | client model
+    client = Client() # Client | client model
    
    # example passing only required values which don't have defaults set
    try:
        # To test \"client\" model
-        api_response = api_instance.test_client_model(client_client)
+        api_response = api_instance.test_client_model(client)
        pprint(api_response)
    except petstore_api.ApiException as e:
        print("Exception when calling FakeApi->test_client_model: %s\n" % e)
@@ -808,11 +808,11 @@ with petstore_api.ApiClient() as api_client:

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **client_client** | [**client.Client**](Client.md)| client model |
+ **client** | [**Client**](Client.md)| client model |

 ### Return type

-[**client.Client**](Client.md)
+[**Client**](Client.md)

 ### Authorization

--- a/samples/openapi3/client/petstore/python-experimental/docs/FakeClassnameTags123Api.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/FakeClassnameTags123Api.md
@@ -8,7 +8,7 @@ Method | HTTP request | Description


 # **test_classname**
-> client.Client test_classname(client_client)
+> Client test_classname(client)

 To test class name in snake case

@@ -21,7 +21,7 @@ To test class name in snake case
 import time
 import petstore_api
 from petstore_api.api import fake_classname_tags_123_api
-from petstore_api.model import client
+from petstore_api.model.client import Client
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -48,12 +48,12 @@ configuration = petstore_api.Configuration(
 with petstore_api.ApiClient(configuration) as api_client:
    # Create an instance of the API class
    api_instance = fake_classname_tags_123_api.FakeClassnameTags123Api(api_client)
-    client_client = client.Client() # client.Client | client model
+    client = Client() # Client | client model
    
    # example passing only required values which don't have defaults set
    try:
        # To test class name in snake case
-        api_response = api_instance.test_classname(client_client)
+        api_response = api_instance.test_classname(client)
        pprint(api_response)
    except petstore_api.ApiException as e:
        print("Exception when calling FakeClassnameTags123Api->test_classname: %s\n" % e)
@@ -63,11 +63,11 @@ with petstore_api.ApiClient(configuration) as api_client:

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **client_client** | [**client.Client**](Client.md)| client model |
+ **client** | [**Client**](Client.md)| client model |

 ### Return type

-[**client.Client**](Client.md)
+[**Client**](Client.md)

 ### Authorization

--- a/samples/openapi3/client/petstore/python-experimental/docs/File.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/File.md
@@ -1,4 +1,4 @@
-# file.File
+# File

 Must be named `File` for test.
 ## Properties
--- a/samples/openapi3/client/petstore/python-experimental/docs/FileSchemaTestClass.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/FileSchemaTestClass.md
@@ -1,10 +1,10 @@
-# file_schema_test_class.FileSchemaTestClass
+# FileSchemaTestClass

 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**file** | [**file.File**](File.md) |  | [optional] 
-**files** | [**[file.File]**](File.md) |  | [optional] 
+**file** | [**File**](File.md) |  | [optional] 
+**files** | [**[File]**](File.md) |  | [optional] 

 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

--- a/samples/openapi3/client/petstore/python-experimental/docs/Foo.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/Foo.md
@@ -1,4 +1,4 @@
-# foo.Foo
+# Foo

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/FormatTest.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/FormatTest.md
@@ -1,4 +1,4 @@
-# format_test.FormatTest
+# FormatTest

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/Fruit.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/Fruit.md
@@ -1,4 +1,4 @@
-# fruit.Fruit
+# Fruit

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/FruitReq.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/FruitReq.md
@@ -1,4 +1,4 @@
-# fruit_req.FruitReq
+# FruitReq

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/GmFruit.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/GmFruit.md
@@ -1,4 +1,4 @@
-# gm_fruit.GmFruit
+# GmFruit

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/GrandparentAnimal.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/GrandparentAnimal.md
@@ -1,4 +1,4 @@
-# grandparent_animal.GrandparentAnimal
+# GrandparentAnimal

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/HasOnlyReadOnly.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/HasOnlyReadOnly.md
@@ -1,4 +1,4 @@
-# has_only_read_only.HasOnlyReadOnly
+# HasOnlyReadOnly

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/HealthCheckResult.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/HealthCheckResult.md
@@ -1,4 +1,4 @@
-# health_check_result.HealthCheckResult
+# HealthCheckResult

 Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model.
 ## Properties
--- a/samples/openapi3/client/petstore/python-experimental/docs/InlineObject.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/InlineObject.md
@@ -1,4 +1,4 @@
-# inline_object.InlineObject
+# InlineObject

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/InlineObject1.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/InlineObject1.md
@@ -1,4 +1,4 @@
-# inline_object1.InlineObject1
+# InlineObject1

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/InlineObject2.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/InlineObject2.md
@@ -1,4 +1,4 @@
-# inline_object2.InlineObject2
+# InlineObject2

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/InlineObject3.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/InlineObject3.md
@@ -1,4 +1,4 @@
-# inline_object3.InlineObject3
+# InlineObject3

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/InlineObject4.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/InlineObject4.md
@@ -1,4 +1,4 @@
-# inline_object4.InlineObject4
+# InlineObject4

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/InlineObject5.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/InlineObject5.md
@@ -1,4 +1,4 @@
-# inline_object5.InlineObject5
+# InlineObject5

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/InlineResponseDefault.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/InlineResponseDefault.md
@@ -1,9 +1,9 @@
-# inline_response_default.InlineResponseDefault
+# InlineResponseDefault

 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**string** | [**foo.Foo**](Foo.md) |  | [optional] 
+**string** | [**Foo**](Foo.md) |  | [optional] 

 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

--- a/samples/openapi3/client/petstore/python-experimental/docs/IntegerEnum.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/IntegerEnum.md
@@ -1,4 +1,4 @@
-# integer_enum.IntegerEnum
+# IntegerEnum

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/IntegerEnumOneValue.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/IntegerEnumOneValue.md
@@ -1,4 +1,4 @@
-# integer_enum_one_value.IntegerEnumOneValue
+# IntegerEnumOneValue

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/IntegerEnumWithDefaultValue.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/IntegerEnumWithDefaultValue.md
@@ -1,4 +1,4 @@
-# integer_enum_with_default_value.IntegerEnumWithDefaultValue
+# IntegerEnumWithDefaultValue

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/IsoscelesTriangle.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/IsoscelesTriangle.md
@@ -1,4 +1,4 @@
-# isosceles_triangle.IsoscelesTriangle
+# IsoscelesTriangle

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/List.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/List.md
@@ -1,4 +1,4 @@
-# list.List
+# List

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/Mammal.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/Mammal.md
@@ -1,4 +1,4 @@
-# mammal.Mammal
+# Mammal

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/MapTest.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/MapTest.md
@@ -1,4 +1,4 @@
-# map_test.MapTest
+# MapTest

 ## Properties
 Name | Type | Description | Notes
@@ -6,7 +6,7 @@ Name | Type | Description | Notes
 **map_map_of_string** | **{str: ({str: (str,)},)}** |  | [optional] 
 **map_of_enum_string** | **{str: (str,)}** |  | [optional] 
 **direct_map** | **{str: (bool,)}** |  | [optional] 
-**indirect_map** | [**string_boolean_map.StringBooleanMap**](StringBooleanMap.md) |  | [optional] 
+**indirect_map** | [**StringBooleanMap**](StringBooleanMap.md) |  | [optional] 

 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

--- a/samples/openapi3/client/petstore/python-experimental/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -1,11 +1,11 @@
-# mixed_properties_and_additional_properties_class.MixedPropertiesAndAdditionalPropertiesClass
+# MixedPropertiesAndAdditionalPropertiesClass

 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **uuid** | **str** |  | [optional] 
 **date_time** | **datetime** |  | [optional] 
-**map** | [**{str: (animal.Animal,)}**](Animal.md) |  | [optional] 
+**map** | [**{str: (Animal,)}**](Animal.md) |  | [optional] 

 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

--- a/samples/openapi3/client/petstore/python-experimental/docs/Model200Response.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/Model200Response.md
@@ -1,4 +1,4 @@
-# model200_response.Model200Response
+# Model200Response

 Model for testing model name starting with number
 ## Properties
--- a/samples/openapi3/client/petstore/python-experimental/docs/ModelReturn.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/ModelReturn.md
@@ -1,4 +1,4 @@
-# model_return.ModelReturn
+# ModelReturn

 Model for testing reserved words
 ## Properties
--- a/samples/openapi3/client/petstore/python-experimental/docs/Name.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/Name.md
@@ -1,4 +1,4 @@
-# name.Name
+# Name

 Model for testing model name same as property name
 ## Properties
--- a/samples/openapi3/client/petstore/python-experimental/docs/NullableClass.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/NullableClass.md
@@ -1,4 +1,4 @@
-# nullable_class.NullableClass
+# NullableClass

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/NullableShape.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/NullableShape.md
@@ -1,4 +1,4 @@
-# nullable_shape.NullableShape
+# NullableShape

 The value may be a shape or the 'null' value. The 'nullable' attribute was introduced in OAS schema >= 3.0 and has been deprecated in OAS schema >= 3.1.
 ## Properties
--- a/samples/openapi3/client/petstore/python-experimental/docs/NumberOnly.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/NumberOnly.md
@@ -1,4 +1,4 @@
-# number_only.NumberOnly
+# NumberOnly

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/NumberWithValidations.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/NumberWithValidations.md
@@ -1,4 +1,4 @@
-# number_with_validations.NumberWithValidations
+# NumberWithValidations

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/ObjectModelWithRefProps.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/ObjectModelWithRefProps.md
@@ -1,10 +1,10 @@
-# object_model_with_ref_props.ObjectModelWithRefProps
+# ObjectModelWithRefProps

 a model that includes properties which should stay primitive (String + Boolean) and one which is defined as a class, NumberWithValidations
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**my_number** | [**number_with_validations.NumberWithValidations**](NumberWithValidations.md) |  | [optional] 
+**my_number** | [**NumberWithValidations**](NumberWithValidations.md) |  | [optional] 
 **my_string** | **str** |  | [optional] 
 **my_boolean** | **bool** |  | [optional] 

--- a/samples/openapi3/client/petstore/python-experimental/docs/Order.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/Order.md
@@ -1,4 +1,4 @@
-# order.Order
+# Order

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/ParentPet.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/ParentPet.md
@@ -1,4 +1,4 @@
-# parent_pet.ParentPet
+# ParentPet

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/Pet.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/Pet.md
@@ -1,4 +1,4 @@
-# pet.Pet
+# Pet

 ## Properties
 Name | Type | Description | Notes
@@ -6,8 +6,8 @@ Name | Type | Description | Notes
 **name** | **str** |  | 
 **photo_urls** | **[str]** |  | 
 **id** | **int** |  | [optional] 
-**category** | [**category.Category**](Category.md) |  | [optional] 
-**tags** | [**[tag.Tag]**](Tag.md) |  | [optional] 
+**category** | [**Category**](Category.md) |  | [optional] 
+**tags** | [**[Tag]**](Tag.md) |  | [optional] 
 **status** | **str** | pet status in the store | [optional] 

 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
--- a/samples/openapi3/client/petstore/python-experimental/docs/PetApi.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/PetApi.md
@@ -16,7 +16,7 @@ Method | HTTP request | Description


 # **add_pet**
-> add_pet(pet_pet)
+> add_pet(pet)

 Add a new pet to the store

@@ -27,7 +27,7 @@ Add a new pet to the store
 import time
 import petstore_api
 from petstore_api.api import pet_api
-from petstore_api.model import pet
+from petstore_api.model.pet import Pet
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -110,12 +110,12 @@ configuration.access_token = 'YOUR_ACCESS_TOKEN'
 with petstore_api.ApiClient(configuration) as api_client:
    # Create an instance of the API class
    api_instance = pet_api.PetApi(api_client)
-    pet_pet = pet.Pet() # pet.Pet | Pet object that needs to be added to the store
+    pet = Pet() # Pet | Pet object that needs to be added to the store
    
    # example passing only required values which don't have defaults set
    try:
        # Add a new pet to the store
-        api_instance.add_pet(pet_pet)
+        api_instance.add_pet(pet)
    except petstore_api.ApiException as e:
        print("Exception when calling PetApi->add_pet: %s\n" % e)
 ```
@@ -124,7 +124,7 @@ with petstore_api.ApiClient(configuration) as api_client:

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **pet_pet** | [**pet.Pet**](Pet.md)| Pet object that needs to be added to the store |
+ **pet** | [**Pet**](Pet.md)| Pet object that needs to be added to the store |

 ### Return type

@@ -227,7 +227,7 @@ void (empty response body)
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)

 # **find_pets_by_status**
-> [pet.Pet] find_pets_by_status(status)
+> [Pet] find_pets_by_status(status)

 Finds Pets by status

@@ -240,7 +240,7 @@ Multiple status values can be provided with comma separated strings
 import time
 import petstore_api
 from petstore_api.api import pet_api
-from petstore_api.model import pet
+from petstore_api.model.pet import Pet
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -342,7 +342,7 @@ Name | Type | Description  | Notes

 ### Return type

-[**[pet.Pet]**](Pet.md)
+[**[Pet]**](Pet.md)

 ### Authorization

@@ -362,7 +362,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)

 # **find_pets_by_tags**
-> [pet.Pet] find_pets_by_tags(tags)
+> [Pet] find_pets_by_tags(tags)

 Finds Pets by tags

@@ -375,7 +375,7 @@ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3
 import time
 import petstore_api
 from petstore_api.api import pet_api
-from petstore_api.model import pet
+from petstore_api.model.pet import Pet
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -477,7 +477,7 @@ Name | Type | Description  | Notes

 ### Return type

-[**[pet.Pet]**](Pet.md)
+[**[Pet]**](Pet.md)

 ### Authorization

@@ -497,7 +497,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)

 # **get_pet_by_id**
-> pet.Pet get_pet_by_id(pet_id)
+> Pet get_pet_by_id(pet_id)

 Find pet by ID

@@ -510,7 +510,7 @@ Returns a single pet
 import time
 import petstore_api
 from petstore_api.api import pet_api
-from petstore_api.model import pet
+from petstore_api.model.pet import Pet
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -556,7 +556,7 @@ Name | Type | Description  | Notes

 ### Return type

-[**pet.Pet**](Pet.md)
+[**Pet**](Pet.md)

 ### Authorization

@@ -577,7 +577,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)

 # **update_pet**
-> update_pet(pet_pet)
+> update_pet(pet)

 Update an existing pet

@@ -588,7 +588,7 @@ Update an existing pet
 import time
 import petstore_api
 from petstore_api.api import pet_api
-from petstore_api.model import pet
+from petstore_api.model.pet import Pet
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -671,12 +671,12 @@ configuration.access_token = 'YOUR_ACCESS_TOKEN'
 with petstore_api.ApiClient(configuration) as api_client:
    # Create an instance of the API class
    api_instance = pet_api.PetApi(api_client)
-    pet_pet = pet.Pet() # pet.Pet | Pet object that needs to be added to the store
+    pet = Pet() # Pet | Pet object that needs to be added to the store
    
    # example passing only required values which don't have defaults set
    try:
        # Update an existing pet
-        api_instance.update_pet(pet_pet)
+        api_instance.update_pet(pet)
    except petstore_api.ApiException as e:
        print("Exception when calling PetApi->update_pet: %s\n" % e)
 ```
@@ -685,7 +685,7 @@ with petstore_api.ApiClient(configuration) as api_client:

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **pet_pet** | [**pet.Pet**](Pet.md)| Pet object that needs to be added to the store |
+ **pet** | [**Pet**](Pet.md)| Pet object that needs to be added to the store |

 ### Return type

@@ -792,7 +792,7 @@ void (empty response body)
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)

 # **upload_file**
-> api_response.ApiResponse upload_file(pet_id)
+> ApiResponse upload_file(pet_id)

 uploads an image

@@ -803,7 +803,7 @@ uploads an image
 import time
 import petstore_api
 from petstore_api.api import pet_api
-from petstore_api.model import api_response
+from petstore_api.model.api_response import ApiResponse
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -858,7 +858,7 @@ Name | Type | Description  | Notes

 ### Return type

-[**api_response.ApiResponse**](ApiResponse.md)
+[**ApiResponse**](ApiResponse.md)

 ### Authorization

@@ -877,7 +877,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)

 # **upload_file_with_required_file**
-> api_response.ApiResponse upload_file_with_required_file(pet_id, required_file)
+> ApiResponse upload_file_with_required_file(pet_id, required_file)

 uploads an image (required)

@@ -888,7 +888,7 @@ uploads an image (required)
 import time
 import petstore_api
 from petstore_api.api import pet_api
-from petstore_api.model import api_response
+from petstore_api.model.api_response import ApiResponse
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -943,7 +943,7 @@ Name | Type | Description  | Notes

 ### Return type

-[**api_response.ApiResponse**](ApiResponse.md)
+[**ApiResponse**](ApiResponse.md)

 ### Authorization

--- a/samples/openapi3/client/petstore/python-experimental/docs/Pig.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/Pig.md
@@ -1,4 +1,4 @@
-# pig.Pig
+# Pig

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/Quadrilateral.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/Quadrilateral.md
@@ -1,4 +1,4 @@
-# quadrilateral.Quadrilateral
+# Quadrilateral

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/QuadrilateralInterface.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/QuadrilateralInterface.md
@@ -1,4 +1,4 @@
-# quadrilateral_interface.QuadrilateralInterface
+# QuadrilateralInterface

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/ReadOnlyFirst.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/ReadOnlyFirst.md
@@ -1,4 +1,4 @@
-# read_only_first.ReadOnlyFirst
+# ReadOnlyFirst

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/ScaleneTriangle.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/ScaleneTriangle.md
@@ -1,4 +1,4 @@
-# scalene_triangle.ScaleneTriangle
+# ScaleneTriangle

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/Shape.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/Shape.md
@@ -1,4 +1,4 @@
-# shape.Shape
+# Shape

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/ShapeInterface.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/ShapeInterface.md
@@ -1,4 +1,4 @@
-# shape_interface.ShapeInterface
+# ShapeInterface

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/ShapeOrNull.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/ShapeOrNull.md
@@ -1,4 +1,4 @@
-# shape_or_null.ShapeOrNull
+# ShapeOrNull

 The value may be a shape or the 'null' value. This is introduced in OAS schema >= 3.1.
 ## Properties
--- a/samples/openapi3/client/petstore/python-experimental/docs/SimpleQuadrilateral.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/SimpleQuadrilateral.md
@@ -1,4 +1,4 @@
-# simple_quadrilateral.SimpleQuadrilateral
+# SimpleQuadrilateral

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/SpecialModelName.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/SpecialModelName.md
@@ -1,4 +1,4 @@
-# special_model_name.SpecialModelName
+# SpecialModelName

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/StoreApi.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/StoreApi.md
@@ -146,7 +146,7 @@ This endpoint does not need any parameter.
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)

 # **get_order_by_id**
-> order.Order get_order_by_id(order_id)
+> Order get_order_by_id(order_id)

 Find purchase order by ID

@@ -158,7 +158,7 @@ For valid response try integer IDs with value <= 5 or > 10. Other values will ge
 import time
 import petstore_api
 from petstore_api.api import store_api
-from petstore_api.model import order
+from petstore_api.model.order import Order
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -190,7 +190,7 @@ Name | Type | Description  | Notes

 ### Return type

-[**order.Order**](Order.md)
+[**Order**](Order.md)

 ### Authorization

@@ -211,7 +211,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)

 # **place_order**
-> order.Order place_order(order_order)
+> Order place_order(order)

 Place an order for a pet

@@ -221,7 +221,7 @@ Place an order for a pet
 import time
 import petstore_api
 from petstore_api.api import store_api
-from petstore_api.model import order
+from petstore_api.model.order import Order
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -234,12 +234,12 @@ configuration = petstore_api.Configuration(
 with petstore_api.ApiClient() as api_client:
    # Create an instance of the API class
    api_instance = store_api.StoreApi(api_client)
-    order_order = order.Order() # order.Order | order placed for purchasing the pet
+    order = Order() # Order | order placed for purchasing the pet
    
    # example passing only required values which don't have defaults set
    try:
        # Place an order for a pet
-        api_response = api_instance.place_order(order_order)
+        api_response = api_instance.place_order(order)
        pprint(api_response)
    except petstore_api.ApiException as e:
        print("Exception when calling StoreApi->place_order: %s\n" % e)
@@ -249,11 +249,11 @@ with petstore_api.ApiClient() as api_client:

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **order_order** | [**order.Order**](Order.md)| order placed for purchasing the pet |
+ **order** | [**Order**](Order.md)| order placed for purchasing the pet |

 ### Return type

-[**order.Order**](Order.md)
+[**Order**](Order.md)

 ### Authorization

--- a/samples/openapi3/client/petstore/python-experimental/docs/StringBooleanMap.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/StringBooleanMap.md
@@ -1,4 +1,4 @@
-# string_boolean_map.StringBooleanMap
+# StringBooleanMap

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/StringEnum.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/StringEnum.md
@@ -1,4 +1,4 @@
-# string_enum.StringEnum
+# StringEnum

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/StringEnumWithDefaultValue.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/StringEnumWithDefaultValue.md
@@ -1,4 +1,4 @@
-# string_enum_with_default_value.StringEnumWithDefaultValue
+# StringEnumWithDefaultValue

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/Tag.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/Tag.md
@@ -1,4 +1,4 @@
-# tag.Tag
+# Tag

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/Triangle.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/Triangle.md
@@ -1,4 +1,4 @@
-# triangle.Triangle
+# Triangle

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/TriangleInterface.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/TriangleInterface.md
@@ -1,4 +1,4 @@
-# triangle_interface.TriangleInterface
+# TriangleInterface

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/User.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/User.md
@@ -1,4 +1,4 @@
-# user.User
+# User

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/UserApi.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/UserApi.md
@@ -15,7 +15,7 @@ Method | HTTP request | Description


 # **create_user**
-> create_user(user_user)
+> create_user(user)

 Create user

@@ -27,7 +27,7 @@ This can only be done by the logged in user.
 import time
 import petstore_api
 from petstore_api.api import user_api
-from petstore_api.model import user
+from petstore_api.model.user import User
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -40,12 +40,12 @@ configuration = petstore_api.Configuration(
 with petstore_api.ApiClient() as api_client:
    # Create an instance of the API class
    api_instance = user_api.UserApi(api_client)
-    user_user = user.User() # user.User | Created user object
+    user = User() # User | Created user object
    
    # example passing only required values which don't have defaults set
    try:
        # Create user
-        api_instance.create_user(user_user)
+        api_instance.create_user(user)
    except petstore_api.ApiException as e:
        print("Exception when calling UserApi->create_user: %s\n" % e)
 ```
@@ -54,7 +54,7 @@ with petstore_api.ApiClient() as api_client:

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **user_user** | [**user.User**](User.md)| Created user object |
+ **user** | [**User**](User.md)| Created user object |

 ### Return type

@@ -77,7 +77,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)

 # **create_users_with_array_input**
-> create_users_with_array_input(user_user)
+> create_users_with_array_input(user)

 Creates list of users with given input array

@@ -87,7 +87,7 @@ Creates list of users with given input array
 import time
 import petstore_api
 from petstore_api.api import user_api
-from petstore_api.model import user
+from petstore_api.model.user import User
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -100,12 +100,12 @@ configuration = petstore_api.Configuration(
 with petstore_api.ApiClient() as api_client:
    # Create an instance of the API class
    api_instance = user_api.UserApi(api_client)
-    user_user = [user.User()] # [user.User] | List of user object
+    user = [User()] # [User] | List of user object
    
    # example passing only required values which don't have defaults set
    try:
        # Creates list of users with given input array
-        api_instance.create_users_with_array_input(user_user)
+        api_instance.create_users_with_array_input(user)
    except petstore_api.ApiException as e:
        print("Exception when calling UserApi->create_users_with_array_input: %s\n" % e)
 ```
@@ -114,7 +114,7 @@ with petstore_api.ApiClient() as api_client:

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **user_user** | [**[user.User]**](User.md)| List of user object |
+ **user** | [**[User]**](User.md)| List of user object |

 ### Return type

@@ -137,7 +137,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)

 # **create_users_with_list_input**
-> create_users_with_list_input(user_user)
+> create_users_with_list_input(user)

 Creates list of users with given input array

@@ -147,7 +147,7 @@ Creates list of users with given input array
 import time
 import petstore_api
 from petstore_api.api import user_api
-from petstore_api.model import user
+from petstore_api.model.user import User
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -160,12 +160,12 @@ configuration = petstore_api.Configuration(
 with petstore_api.ApiClient() as api_client:
    # Create an instance of the API class
    api_instance = user_api.UserApi(api_client)
-    user_user = [user.User()] # [user.User] | List of user object
+    user = [User()] # [User] | List of user object
    
    # example passing only required values which don't have defaults set
    try:
        # Creates list of users with given input array
-        api_instance.create_users_with_list_input(user_user)
+        api_instance.create_users_with_list_input(user)
    except petstore_api.ApiException as e:
        print("Exception when calling UserApi->create_users_with_list_input: %s\n" % e)
 ```
@@ -174,7 +174,7 @@ with petstore_api.ApiClient() as api_client:

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **user_user** | [**[user.User]**](User.md)| List of user object |
+ **user** | [**[User]**](User.md)| List of user object |

 ### Return type

@@ -259,7 +259,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)

 # **get_user_by_name**
-> user.User get_user_by_name(username)
+> User get_user_by_name(username)

 Get user by user name

@@ -269,7 +269,7 @@ Get user by user name
 import time
 import petstore_api
 from petstore_api.api import user_api
-from petstore_api.model import user
+from petstore_api.model.user import User
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -301,7 +301,7 @@ Name | Type | Description  | Notes

 ### Return type

-[**user.User**](User.md)
+[**User**](User.md)

 ### Authorization

@@ -440,7 +440,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)

 # **update_user**
-> update_user(username, user_user)
+> update_user(username, user)

 Updated user

@@ -452,7 +452,7 @@ This can only be done by the logged in user.
 import time
 import petstore_api
 from petstore_api.api import user_api
-from petstore_api.model import user
+from petstore_api.model.user import User
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -466,12 +466,12 @@ with petstore_api.ApiClient() as api_client:
    # Create an instance of the API class
    api_instance = user_api.UserApi(api_client)
    username = 'username_example' # str | name that need to be deleted
-    user_user = user.User() # user.User | Updated user object
+    user = User() # User | Updated user object
    
    # example passing only required values which don't have defaults set
    try:
        # Updated user
-        api_instance.update_user(username, user_user)
+        api_instance.update_user(username, user)
    except petstore_api.ApiException as e:
        print("Exception when calling UserApi->update_user: %s\n" % e)
 ```
@@ -481,7 +481,7 @@ with petstore_api.ApiClient() as api_client:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 **username** | **str**| name that need to be deleted |
- **user_user** | [**user.User**](User.md)| Updated user object |
+ **user** | [**User**](User.md)| Updated user object |

 ### Return type

--- a/samples/openapi3/client/petstore/python-experimental/docs/Whale.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/Whale.md
@@ -1,4 +1,4 @@
-# whale.Whale
+# Whale

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/docs/Zebra.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/Zebra.md
@@ -1,4 +1,4 @@
-# zebra.Zebra
+# Zebra

 ## Properties
 Name | Type | Description | Notes
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/another_fake_api.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/another_fake_api.py
@@ -23,7 +23,7 @@ from petstore_api.model_utils import (  # noqa: F401
    none_type,
    validate_and_convert_types
 )
-from petstore_api.model import client
+from petstore_api.model.client import Client


 class AnotherFakeApi(object):
@@ -40,7 +40,7 @@ class AnotherFakeApi(object):

        def __call_123_test_special_tags(
            self,
-            client_client,
+            client,
            **kwargs
        ):
            """To test special tags  # noqa: E501
@@ -49,11 +49,11 @@ class AnotherFakeApi(object):
            This method makes a synchronous HTTP request by default. To make an
            asynchronous HTTP request, please pass async_req=True

-            >>> thread = api.call_123_test_special_tags(client_client, async_req=True)
+            >>> thread = api.call_123_test_special_tags(client, async_req=True)
            >>> result = thread.get()

            Args:
-                client_client (client.Client): client model
+                client (Client): client model

            Keyword Args:
                _return_http_data_only (bool): response data without head status
@@ -77,7 +77,7 @@ class AnotherFakeApi(object):
                async_req (bool): execute request asynchronously

            Returns:
-                client.Client
+                Client
                    If the method is called asynchronously, returns the request
                    thread.
            """
@@ -100,13 +100,13 @@ class AnotherFakeApi(object):
                '_check_return_type', True
            )
            kwargs['_host_index'] = kwargs.get('_host_index')
-            kwargs['client_client'] = \
-                client_client
+            kwargs['client'] = \
+                client
            return self.call_with_http_info(**kwargs)

        self.call_123_test_special_tags = Endpoint(
            settings={
-                'response_type': (client.Client,),
+                'response_type': (Client,),
                'auth': [],
                'endpoint_path': '/another-fake/dummy',
                'operation_id': 'call_123_test_special_tags',
@@ -115,10 +115,10 @@ class AnotherFakeApi(object):
            },
            params_map={
                'all': [
-                    'client_client',
+                    'client',
                ],
                'required': [
-                    'client_client',
+                    'client',
                ],
                'nullable': [
                ],
@@ -133,13 +133,13 @@ class AnotherFakeApi(object):
                'allowed_values': {
                },
                'openapi_types': {
-                    'client_client':
-                        (client.Client,),
+                    'client':
+                        (Client,),
                },
                'attribute_map': {
                },
                'location_map': {
-                    'client_client': 'body',
+                    'client': 'body',
                },
                'collection_format_map': {
                }
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/default_api.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/default_api.py
@@ -23,7 +23,7 @@ from petstore_api.model_utils import (  # noqa: F401
    none_type,
    validate_and_convert_types
 )
-from petstore_api.model import inline_response_default
+from petstore_api.model.inline_response_default import InlineResponseDefault


 class DefaultApi(object):
@@ -73,7 +73,7 @@ class DefaultApi(object):
                async_req (bool): execute request asynchronously

            Returns:
-                inline_response_default.InlineResponseDefault
+                InlineResponseDefault
                    If the method is called asynchronously, returns the request
                    thread.
            """
@@ -100,7 +100,7 @@ class DefaultApi(object):

        self.foo_get = Endpoint(
            settings={
-                'response_type': (inline_response_default.InlineResponseDefault,),
+                'response_type': (InlineResponseDefault,),
                'auth': [],
                'endpoint_path': '/foo',
                'operation_id': 'foo_get',
--- a/Show More
+++ b/Show More