From 9f1fa0e44012a11f85d8360cfe5f634530e49e57 Mon Sep 17 00:00:00 2001 From: Nathan Baulch Date: Tue, 8 Nov 2022 00:30:24 +1100 Subject: [PATCH] Fix another batch of spelling typos (#13915) * Fix typos * Remove repeated words * Minor grammar fixes --- .../workflows/samples-java-client-jdk11.yaml | 2 +- .github/workflows/samples-kotlin-client.yaml | 2 +- .gitpod.yml | 2 +- .../aspnetcore-6.0-project4Models.yaml | 2 +- bin/configs/java-camel-petstore-new.yaml | 2 +- .../java-webclient-nullable-array.yaml | 2 +- bin/configs/swift5-deprecated.yaml | 2 +- bin/utils/test_file_list.yaml | 4 +- docs/customization.md | 6 +- docs/generators/aspnetcore.md | 2 +- docs/generators/java-camel.md | 2 +- docs/generators/wsdl-schema.md | 2 +- docs/migration-from-swagger-codegen.md | 4 +- docs/migration-guide.adoc | 2 +- docs/new-generator.md | 2 +- docs/online.md | 2 +- docs/roadmap.adoc | 2 +- docs/roadmap.md | 4 +- docs/templating.md | 2 +- docs/usage.md | 2 +- .../examples/camel.xml | 4 +- .../src/main/resources/openapi.yaml | 2 +- .../examples/swagger.yaml | 2 +- .../src/test/resources/default/petstore.yaml | 2 +- .../test/resources/petstore-on-classpath.yaml | 2 +- .../openapitools/codegen/DefaultCodegen.java | 2 +- .../codegen/InlineModelResolver.java | 4 +- .../codegen/languages/AbstractPhpCodegen.java | 2 +- .../languages/AspNetCoreServerCodegen.java | 26 +++---- .../languages/CSharpNetCoreClientCodegen.java | 2 +- .../languages/DartDioClientCodegen.java | 2 +- .../languages/JavaCamelServerCodegen.java | 10 +-- .../codegen/languages/JavaClientCodegen.java | 2 +- .../codegen/languages/KtormSchemaCodegen.java | 4 +- .../languages/PythonClientCodegen.java | 20 +++--- .../codegen/languages/RClientCodegen.java | 2 +- .../languages/ScalaSttpClientCodegen.java | 8 +-- .../codegen/languages/WsdlSchemaCodegen.java | 2 +- .../mustache/OptionalParameterLambda.java | 2 +- .../mustache/RequiredParameterLambda.java | 2 +- .../codegen/utils/ModelUtils.java | 10 +-- .../validations/oas/RuleConfiguration.java | 6 +- .../main/resources/C-libcurl/cJSON.c.mustache | 2 +- .../main/resources/Eiffel/api_client.mustache | 2 +- .../native/additional_properties.mustache | 2 +- .../Java/libraries/okhttp-gson/pojo.mustache | 2 +- .../cxf-ext/CXF2InterfaceComparator.mustache | 2 +- .../cxf/CXF2InterfaceComparator.mustache | 2 +- .../resources/JavaJaxRS/spec/README.mustache | 4 +- .../spec/libraries/helidon/README.mustache | 2 +- .../spec/libraries/kumuluzee/README.mustache | 2 +- .../libraries/openliberty/README.mustache | 2 +- .../spec/libraries/quarkus/README.mustache | 2 +- .../spec/libraries/thorntail/README.mustache | 2 +- .../Javascript-Flowtyped/README.mustache | 2 +- .../Javascript/partial_model_oneof.mustache | 6 +- .../aspnetcore/3.0/Project.csproj.mustache | 8 +-- .../aspnetcore/3.0/Solution.mustache | 8 +-- .../model-validation-body.mustache | 2 +- .../cpp-tizen-client/Doxyfile.mustache | 4 +- .../ApiClient.mustache | 4 +- .../ClientUtils.mustache | 2 +- .../Configuration.mustache | 6 +- .../HttpSigningConfiguration.mustache | 26 +++---- .../IReadableConfiguration.mustache | 2 +- .../RequestOptions.mustache | 2 +- .../git_push.sh.mustache | 2 +- .../libraries/httpclient/ApiClient.mustache | 12 ++-- .../httpclient/RequestOptions.mustache | 2 +- .../libraries/httpclient/api.mustache | 12 ++-- .../libraries/httpclient/model.mustache | 4 +- .../modelAnyOf.mustache | 2 +- .../modelOneOf.mustache | 2 +- .../csharp-netcore-functions/nuspec.mustache | 2 +- .../csharp-netcore/RequestOptions.mustache | 2 +- .../generichost/ApiException.mustache | 2 +- .../generichost/ApiResponse`1.mustache | 2 +- .../HttpSigningConfiguration.mustache | 18 ++--- .../libraries/generichost/README.mustache | 2 +- .../libraries/generichost/api.mustache | 4 +- .../generichost/git_push.ps1.mustache | 2 +- .../httpclient/RequestOptions.mustache | 2 +- .../built_value/class_serializer.mustache | 2 +- .../libraries/jvm-volley/README.mustache | 4 +- .../libraries/jvm-volley/auth/oauth.mustache | 2 +- .../request/RequestFactory.mustache | 2 +- .../utils/openapiRouter.mustache | 2 +- .../resources/php-slim-server/index.mustache | 2 +- .../resources/php/ObjectSerializer.mustache | 4 +- .../powershell/http_signature_auth.mustache | 2 +- .../resources/protobuf-schema/README.mustache | 6 +- .../resources/python-aiohttp/README.mustache | 2 +- .../python-prior/__init__models.mustache | 2 +- .../python/__init__models.handlebars | 2 +- .../resources/python/api_client.handlebars | 4 +- .../resources/python/configuration.handlebars | 4 +- .../resources/python/git_push.sh.handlebars | 2 +- .../main/resources/python/schemas.handlebars | 34 ++++----- .../main/resources/python/signing.handlebars | 2 +- .../src/main/resources/r/ApiResponse.mustache | 2 +- .../src/main/resources/r/api.mustache | 2 +- .../src/main/resources/r/api_client.mustache | 4 +- .../r/libraries/httr2/api_client.mustache | 8 +-- .../src/main/resources/r/modelAnyOf.mustache | 2 +- .../main/resources/r/modelGeneric.mustache | 4 +- .../src/main/resources/r/modelOneOf.mustache | 2 +- .../resources/rust-server/models.mustache | 2 +- .../scala-akka-client/apiInvoker.mustache | 2 +- .../src/main/resources/scalatra/web.xml | 2 +- .../main/resources/swift5/APIHelper.mustache | 2 +- .../src/main/resources/swift5/api.mustache | 6 +- .../resources/typescript-aurelia/README.md | 2 +- .../typescript-fetch/runtime.mustache | 14 ++-- .../codegen/DefaultCodegenTest.java | 2 +- .../jaxrs/JavaJAXRSSpecServerCodegenTest.java | 4 +- .../java/spring/SpringCodegenTest.java | 4 +- .../codegen/swift5/Swift5ModelEnumTest.java | 6 +- .../typescript/SharedTypeScriptTest.java | 2 +- .../TypeScriptNodeModelTest.java | 4 +- .../test/resources/2_0/globalSecurity.json | 2 +- .../2_0/long_description_issue_7839.json | 2 +- .../src/test/resources/2_0/petstore-bash.json | 2 +- .../test/resources/2_0/petstore-nullable.yaml | 2 +- .../src/test/resources/2_0/petstore-orig.json | 2 +- .../test/resources/2_0/petstore-proto.yaml | 2 +- .../resources/2_0/petstore-vendor-mime.yaml | 2 +- .../2_0/petstore-with-date-field.yaml | 2 +- ...r-testing-playframework-with-security.yaml | 2 +- ...s-models-for-testing-saga-and-records.yaml | 2 +- ...dels-for-testing-with-spring-pageable.yaml | 4 +- ...ith-fake-endpoints-models-for-testing.yaml | 4 +- ...th-operations-without-required-params.yaml | 2 +- .../2_0/petstore-with-spring-pageable.yaml | 2 +- .../src/test/resources/2_0/petstore.json | 2 +- .../src/test/resources/2_0/petstore.yaml | 2 +- .../resources/2_0/petstore_issue_7999.json | 2 +- ...ith-fake-endpoints-models-for-testing.yaml | 4 +- ...ith-fake-endpoints-models-for-testing.yaml | 2 +- .../2_0/rust-server/rust-server-test.yaml | 2 +- ...ith-fake-endpoints-models-for-testing.yaml | 4 +- .../test/resources/3_0/asciidoc/api-docs.json | 2 +- .../resources/3_0/aspnetcore/petstore.yaml | 2 +- .../resources/3_0/avro-schema/petstore.yaml | 2 +- .../test/resources/3_0/cpp-qt/petstore.yaml | 2 +- .../test/resources/3_0/crystal/petstore.yaml | 2 +- ...odels-for-testing-with-http-signature.yaml | 4 +- ...odels-for-testing-with-http-signature.yaml | 4 +- .../src/test/resources/3_0/elm.yaml | 2 +- ...odels-for-testing-with-http-signature.yaml | 6 +- .../3_0/helidon/petstore-for-testing.yaml | 4 +- .../petstore-no-multipart-for-testing.yaml | 2 +- .../resources/3_0/inline_model_resolver.yaml | 2 +- .../src/test/resources/3_0/issue_11772.yml | 2 +- .../src/test/resources/3_0/issue_13025.yaml | 2 +- .../src/test/resources/3_0/issue_3248.yaml | 4 +- .../src/test/resources/3_0/issue_5381.yaml | 2 +- .../src/test/resources/3_0/issue_6762.yaml | 4 +- .../src/test/resources/3_0/issue_7361.yaml | 2 +- ...sting-with-http-signature-okhttp-gson.yaml | 4 +- ...odels-for-testing-with-http-signature.yaml | 4 +- ...ith-fake-endpoints-models-for-testing.yaml | 4 +- .../resources/3_0/kotlin/reserved_words.yaml | 2 +- .../src/test/resources/3_0/mapSchemas.yaml | 2 +- .../3_0/micronaut/roles-extension-test.yaml | 2 +- .../oneof_polymorphism_and_inheritance.yaml | 2 +- .../3_0/petstore-with-complex-headers.yaml | 2 +- ...l => petstore-with-deprecated-fields.yaml} | 2 +- ...odels-for-testing-with-http-signature.yaml | 4 +- ...ith-fake-endpoints-models-for-testing.yaml | 4 +- .../3_0/petstore-with-nullable-required.yaml | 2 +- .../petstore-with-object-as-parameter.yaml | 2 +- .../src/test/resources/3_0/petstore.json | 2 +- .../src/test/resources/3_0/petstore.yaml | 2 +- .../resources/3_0/petstore_oas3_test.yaml | 2 +- ...odels-for-testing-with-http-signature.yaml | 4 +- .../resources/3_0/powershell/petstore.yaml | 2 +- .../test/resources/3_0/protobuf/petstore.yaml | 2 +- ...odels-for-testing-with-http-signature.yaml | 6 +- ...odels-for-testing-with-http-signature.yaml | 6 +- .../src/test/resources/3_0/r/petstore.yaml | 2 +- .../test/resources/3_0/response-tests.yaml | 2 +- .../3_0/rust-server/no-example-v3.yaml | 2 +- .../src/test/resources/3_0/rust/petstore.yaml | 2 +- .../resources/3_0/scala-akka/petstore.yaml | 2 +- .../test/resources/3_0/scala/petstore.yaml | 2 +- .../resources/3_0/schema-unalias-test.yml | 2 +- .../test/resources/3_0/server-required.yaml | 2 +- .../date-time-parameter-types-for-testing.yml | 2 +- .../unit_test_spec/3_0_3_unit_test_spec.yaml | 2 +- .../src/test/resources/3_0/wsdl/petstore.yaml | 2 +- .../src/test/resources/3_1/petstore.yaml | 2 +- .../typescript/node-es5-expected/api.ts | 2 +- .../typescript/node-es5-spec.json | 2 +- .../petstore-expected/api/store.service.ts | 2 +- .../typescript/petstore-spec.json | 2 +- .../src/test/resources/petstore.json | 2 +- .../Org.OpenAPITools/Client/RequestOptions.cs | 2 +- .../R-httr2-wrapper/.openapi-generator-ignore | 2 +- .../R/allof_tag_api_response.R | 4 +- .../petstore/R-httr2-wrapper/R/animal.R | 4 +- .../petstore/R-httr2-wrapper/R/any_of_pig.R | 2 +- .../R/any_of_primitive_type_test.R | 2 +- .../petstore/R-httr2-wrapper/R/api_client.R | 8 +-- .../petstore/R-httr2-wrapper/R/api_response.R | 2 +- .../petstore/R-httr2-wrapper/R/basque_pig.R | 4 +- .../client/petstore/R-httr2-wrapper/R/cat.R | 4 +- .../petstore/R-httr2-wrapper/R/cat_all_of.R | 4 +- .../petstore/R-httr2-wrapper/R/category.R | 4 +- .../petstore/R-httr2-wrapper/R/danish_pig.R | 4 +- .../client/petstore/R-httr2-wrapper/R/date.R | 4 +- .../client/petstore/R-httr2-wrapper/R/dog.R | 4 +- .../petstore/R-httr2-wrapper/R/dog_all_of.R | 4 +- .../petstore/R-httr2-wrapper/R/format_test.R | 4 +- .../petstore/R-httr2-wrapper/R/mammal.R | 2 +- .../R-httr2-wrapper/R/model_api_response.R | 4 +- .../R-httr2-wrapper/R/nested_one_of.R | 4 +- .../R/one_of_primitive_type_test.R | 2 +- .../client/petstore/R-httr2-wrapper/R/order.R | 4 +- .../client/petstore/R-httr2-wrapper/R/pet.R | 4 +- .../client/petstore/R-httr2-wrapper/R/pig.R | 2 +- .../petstore/R-httr2-wrapper/R/special.R | 4 +- .../petstore/R-httr2-wrapper/R/store_api.R | 2 +- .../client/petstore/R-httr2-wrapper/R/tag.R | 4 +- .../R-httr2-wrapper/R/update_pet_request.R | 4 +- .../client/petstore/R-httr2-wrapper/R/user.R | 4 +- .../client/petstore/R-httr2-wrapper/R/whale.R | 4 +- .../client/petstore/R-httr2-wrapper/R/zebra.R | 4 +- .../petstore/R-httr2-wrapper/docs/StoreApi.md | 2 +- .../tests/testthat/test_petstore.R | 2 +- .../tests/testthat/test_store_api.R | 2 +- .../R-httr2/.openapi-generator-ignore | 2 +- .../R-httr2/R/allof_tag_api_response.R | 2 +- samples/client/petstore/R-httr2/R/animal.R | 2 +- .../client/petstore/R-httr2/R/any_of_pig.R | 2 +- .../R-httr2/R/any_of_primitive_type_test.R | 2 +- .../client/petstore/R-httr2/R/api_client.R | 8 +-- .../client/petstore/R-httr2/R/api_response.R | 2 +- .../client/petstore/R-httr2/R/basque_pig.R | 2 +- samples/client/petstore/R-httr2/R/cat.R | 2 +- .../client/petstore/R-httr2/R/cat_all_of.R | 2 +- samples/client/petstore/R-httr2/R/category.R | 2 +- .../client/petstore/R-httr2/R/danish_pig.R | 2 +- samples/client/petstore/R-httr2/R/date.R | 2 +- samples/client/petstore/R-httr2/R/dog.R | 2 +- .../client/petstore/R-httr2/R/dog_all_of.R | 2 +- .../client/petstore/R-httr2/R/format_test.R | 2 +- samples/client/petstore/R-httr2/R/mammal.R | 2 +- .../petstore/R-httr2/R/model_api_response.R | 2 +- .../client/petstore/R-httr2/R/nested_one_of.R | 2 +- .../R-httr2/R/one_of_primitive_type_test.R | 2 +- samples/client/petstore/R-httr2/R/order.R | 2 +- samples/client/petstore/R-httr2/R/pet.R | 2 +- samples/client/petstore/R-httr2/R/pig.R | 2 +- samples/client/petstore/R-httr2/R/special.R | 2 +- samples/client/petstore/R-httr2/R/store_api.R | 2 +- samples/client/petstore/R-httr2/R/tag.R | 2 +- .../petstore/R-httr2/R/update_pet_request.R | 2 +- samples/client/petstore/R-httr2/R/user.R | 2 +- samples/client/petstore/R-httr2/R/whale.R | 2 +- samples/client/petstore/R-httr2/R/zebra.R | 2 +- .../client/petstore/R-httr2/docs/StoreApi.md | 2 +- .../client/petstore/R-httr2/man/StoreApi.Rd | 2 +- .../R-httr2/tests/testthat/test_petstore.R | 2 +- .../R-httr2/tests/testthat/test_store_api.R | 2 +- .../petstore/R/.openapi-generator-ignore | 2 +- .../petstore/R/R/allof_tag_api_response.R | 4 +- samples/client/petstore/R/R/animal.R | 4 +- samples/client/petstore/R/R/any_of_pig.R | 2 +- .../petstore/R/R/any_of_primitive_type_test.R | 2 +- samples/client/petstore/R/R/api_client.R | 4 +- samples/client/petstore/R/R/api_response.R | 2 +- samples/client/petstore/R/R/basque_pig.R | 4 +- samples/client/petstore/R/R/cat.R | 4 +- samples/client/petstore/R/R/cat_all_of.R | 4 +- samples/client/petstore/R/R/category.R | 4 +- samples/client/petstore/R/R/danish_pig.R | 4 +- samples/client/petstore/R/R/date.R | 4 +- samples/client/petstore/R/R/dog.R | 4 +- samples/client/petstore/R/R/dog_all_of.R | 4 +- samples/client/petstore/R/R/format_test.R | 4 +- samples/client/petstore/R/R/mammal.R | 2 +- .../client/petstore/R/R/model_api_response.R | 4 +- samples/client/petstore/R/R/nested_one_of.R | 4 +- .../petstore/R/R/one_of_primitive_type_test.R | 2 +- samples/client/petstore/R/R/order.R | 4 +- samples/client/petstore/R/R/pet.R | 4 +- samples/client/petstore/R/R/pig.R | 2 +- samples/client/petstore/R/R/special.R | 4 +- samples/client/petstore/R/R/store_api.R | 2 +- samples/client/petstore/R/R/tag.R | 4 +- .../client/petstore/R/R/update_pet_request.R | 4 +- samples/client/petstore/R/R/user.R | 4 +- samples/client/petstore/R/R/whale.R | 4 +- samples/client/petstore/R/R/zebra.R | 4 +- samples/client/petstore/R/docs/StoreApi.md | 2 +- .../petstore/R/tests/testthat/test_petstore.R | 2 +- .../R/tests/testthat/test_store_api.R | 2 +- .../petstore/ada/.openapi-generator-ignore | 2 +- .../src/client/samples-petstore-clients.adb | 2 +- .../src/client/samples-petstore-clients.ads | 2 +- .../android/httpclient/docs/StoreApi.md | 2 +- .../org/openapitools/client/api/StoreApi.java | 2 +- .../petstore/android/volley/docs/StoreApi.md | 2 +- .../org/openapitools/client/api/StoreApi.java | 4 +- .../main/default/classes/OASStoreApi.cls | 2 +- .../main/default/classes/OASStoreApiTest.cls | 2 +- .../async-scala/.openapi-generator-ignore | 2 +- samples/client/petstore/bash/client.sh | 48 ++++++------- samples/client/petstore/bash/docs/StoreApi.md | 2 +- samples/client/petstore/bash/petstore-cli | 4 +- samples/client/petstore/c/CMakeLists.txt | 6 +- samples/client/petstore/c/api/StoreAPI.c | 2 +- samples/client/petstore/c/api/StoreAPI.h | 2 +- samples/client/petstore/c/docs/StoreAPI.md | 2 +- samples/client/petstore/c/external/cJSON.c | 2 +- .../petstore/c/unit-tests/manual-user.c | 6 +- samples/client/petstore/clojure/git_push.sh | 2 +- .../src/open_api_petstore/api/store.clj | 4 +- .../clojure/src/open_api_petstore/core.clj | 6 +- .../petstore/cpp-qt/build-and-test.bash | 2 +- .../CppRestPetstoreClient/api/StoreApi.h | 2 +- .../petstore/cpp-tiny/lib/service/StoreApi.h | 2 +- .../client/petstore/cpp-tizen/doc/Doxyfile | 4 +- .../petstore/cpp-tizen/src/StoreManager.h | 4 +- .../Public/OpenAPIStoreApiOperations.h | 2 +- .../crystal/spec/api/store_api_spec.cr | 2 +- .../crystal/src/petstore/api/store_api.cr | 4 +- .../Lib/OpenAPIClient/docs/StoreApi.md | 2 +- .../Org/OpenAPITools/Api/StoreApi.cs | 4 +- .../Org/OpenAPITools/Client/ApiClient.cs | 2 +- .../Lib/SwaggerClient/docs/StoreApi.md | 2 +- .../Org/OpenAPITools/Api/StoreApi.cs | 4 +- .../Org/OpenAPITools/Client/ApiClient.cs | 2 +- .../Org/OpenAPITools/Client/Configuration.cs | 2 +- .../generatedSrc/Client/ApiClient.cs | 4 +- .../generatedSrc/Client/Configuration.cs | 4 +- .../csharp-netcore-functions/git_push.sh | 2 +- .../src/Org.OpenAPITools/Client/ApiClient.cs | 4 +- .../Org.OpenAPITools/Client/Configuration.cs | 4 +- .../Client/IReadableConfiguration.cs | 2 +- .../Org.OpenAPITools/Client/RequestOptions.cs | 2 +- .../docs/FakeApi.md | 2 +- .../docs/StoreApi.md | 2 +- .../src/Org.OpenAPITools/Api/StoreApi.cs | 16 ++--- .../Org.OpenAPITools/Client/RequestOptions.cs | 2 +- .../README.md | 2 +- .../docs/apis/FakeApi.md | 2 +- .../docs/apis/StoreApi.md | 2 +- .../docs/scripts/git_push.ps1 | 2 +- .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 4 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 4 +- .../src/Org.OpenAPITools/Api/FakeApi.cs | 60 ++++++++-------- .../Api/FakeClassnameTags123Api.cs | 4 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 36 +++++----- .../src/Org.OpenAPITools/Api/StoreApi.cs | 28 ++++---- .../src/Org.OpenAPITools/Api/UserApi.cs | 32 ++++----- .../Org.OpenAPITools/Client/ApiException.cs | 2 +- .../Org.OpenAPITools/Client/ApiResponse`1.cs | 2 +- .../Client/HttpSigningConfiguration.cs | 18 ++--- .../README.md | 2 +- .../docs/apis/FakeApi.md | 2 +- .../docs/apis/StoreApi.md | 2 +- .../docs/scripts/git_push.ps1 | 2 +- .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 4 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 4 +- .../src/Org.OpenAPITools/Api/FakeApi.cs | 60 ++++++++-------- .../Api/FakeClassnameTags123Api.cs | 4 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 36 +++++----- .../src/Org.OpenAPITools/Api/StoreApi.cs | 26 +++---- .../src/Org.OpenAPITools/Api/UserApi.cs | 32 ++++----- .../Org.OpenAPITools/Client/ApiException.cs | 2 +- .../Org.OpenAPITools/Client/ApiResponse`1.cs | 2 +- .../Client/HttpSigningConfiguration.cs | 18 ++--- .../README.md | 2 +- .../docs/apis/FakeApi.md | 2 +- .../docs/apis/StoreApi.md | 2 +- .../docs/scripts/git_push.ps1 | 2 +- .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 4 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 4 +- .../src/Org.OpenAPITools/Api/FakeApi.cs | 60 ++++++++-------- .../Api/FakeClassnameTags123Api.cs | 4 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 36 +++++----- .../src/Org.OpenAPITools/Api/StoreApi.cs | 26 +++---- .../src/Org.OpenAPITools/Api/UserApi.cs | 32 ++++----- .../Org.OpenAPITools/Client/ApiException.cs | 2 +- .../Org.OpenAPITools/Client/ApiResponse`1.cs | 2 +- .../Client/HttpSigningConfiguration.cs | 18 ++--- .../OpenAPIClient-httpclient/docs/FakeApi.md | 2 +- .../OpenAPIClient-httpclient/docs/StoreApi.md | 2 +- .../Org.OpenAPITools.Test/Api/PetApiTests.cs | 10 +-- .../src/Org.OpenAPITools/Api/StoreApi.cs | 16 ++--- .../Org.OpenAPITools/Client/RequestOptions.cs | 2 +- .../OpenAPIClient-net47/docs/FakeApi.md | 2 +- .../OpenAPIClient-net47/docs/StoreApi.md | 2 +- .../src/Org.OpenAPITools/Api/StoreApi.cs | 16 ++--- .../Org.OpenAPITools/Client/RequestOptions.cs | 2 +- .../OpenAPIClient-net48/docs/FakeApi.md | 2 +- .../OpenAPIClient-net48/docs/StoreApi.md | 2 +- .../src/Org.OpenAPITools/Api/StoreApi.cs | 16 ++--- .../Org.OpenAPITools/Client/RequestOptions.cs | 2 +- .../OpenAPIClient-net5.0/docs/FakeApi.md | 2 +- .../OpenAPIClient-net5.0/docs/StoreApi.md | 2 +- .../src/Org.OpenAPITools/Api/StoreApi.cs | 16 ++--- .../Org.OpenAPITools/Client/RequestOptions.cs | 2 +- .../OpenAPIClient/docs/FakeApi.md | 2 +- .../OpenAPIClient/docs/StoreApi.md | 2 +- .../Org.OpenAPITools.Test/Api/PetApiTests.cs | 2 +- .../JSONComposedSchemaTests.cs | 2 +- .../Org.OpenAPITools.Test/Model/PetTests.cs | 4 +- .../src/Org.OpenAPITools/Api/StoreApi.cs | 16 ++--- .../Org.OpenAPITools/Client/RequestOptions.cs | 2 +- .../Org.OpenAPITools/Org.OpenAPITools.nuspec | 2 +- .../OpenAPIClientCore/docs/FakeApi.md | 2 +- .../OpenAPIClientCore/docs/StoreApi.md | 2 +- .../src/Org.OpenAPITools/Api/StoreApi.cs | 16 ++--- .../Org.OpenAPITools/Client/RequestOptions.cs | 2 +- .../Org.OpenAPITools/Org.OpenAPITools.nuspec | 2 +- .../docs/StoreApi.md | 2 +- .../src/Org.OpenAPITools/Api/StoreApi.cs | 16 ++--- .../Org.OpenAPITools/Client/RequestOptions.cs | 2 +- .../csharp/OpenAPIClient/docs/FakeApi.md | 2 +- .../csharp/OpenAPIClient/docs/StoreApi.md | 2 +- .../src/Org.OpenAPITools/Api/StoreApi.cs | 16 ++--- .../csharp/OpenAPIClientNet35/build.sh | 2 +- .../csharp/OpenAPIClientNet35/docs/FakeApi.md | 2 +- .../OpenAPIClientNet35/docs/StoreApi.md | 2 +- .../csharp/OpenAPIClientNet35/git_push.sh | 2 +- .../src/Org.OpenAPITools/Api/StoreApi.cs | 8 +-- .../Client/IReadableConfiguration.cs | 2 +- .../Org.OpenAPITools/Org.OpenAPITools.nuspec | 2 +- .../csharp/OpenAPIClientNet40/build.sh | 2 +- .../csharp/OpenAPIClientNet40/docs/FakeApi.md | 2 +- .../OpenAPIClientNet40/docs/StoreApi.md | 2 +- .../csharp/OpenAPIClientNet40/git_push.sh | 2 +- .../src/Org.OpenAPITools/Api/StoreApi.cs | 8 +-- .../Client/IReadableConfiguration.cs | 2 +- .../Org.OpenAPITools/Org.OpenAPITools.nuspec | 2 +- .../docs/FakeApi.md | 2 +- .../docs/StoreApi.md | 2 +- .../OpenAPIClientNetCoreProject/git_push.sh | 2 +- .../src/Org.OpenAPITools/Api/StoreApi.cs | 16 ++--- .../Client/IReadableConfiguration.cs | 2 +- .../OpenAPIClientNetStandard/docs/FakeApi.md | 2 +- .../OpenAPIClientNetStandard/docs/StoreApi.md | 2 +- .../OpenAPIClientNetStandard/git_push.sh | 2 +- .../src/Org.OpenAPITools/Api/StoreApi.cs | 16 ++--- .../Client/IReadableConfiguration.cs | 2 +- .../OpenAPIClientWithPropertyChanged/build.sh | 2 +- .../docs/FakeApi.md | 2 +- .../docs/StoreApi.md | 2 +- .../git_push.sh | 2 +- .../src/Org.OpenAPITools/Api/StoreApi.cs | 16 ++--- .../Client/IReadableConfiguration.cs | 2 +- .../Org.OpenAPITools/Org.OpenAPITools.nuspec | 2 +- .../client/petstore/eiffel/docs/STORE_API.md | 2 +- samples/client/petstore/eiffel/gitpush.sh | 2 +- .../petstore/eiffel/src/api/store_api.e | 2 +- .../client/petstore/eiffel/src/api_client.e | 14 ++-- .../src/framework/auth/http_basic_auth.e | 2 +- .../eiffel/src/framework/auth/oauth.e | 2 +- .../serialization/api_deserializer.e | 2 +- .../framework/serialization/api_serializer.e | 2 +- .../json_basic_reflector_deserializer.e | 2 +- .../eiffel/test/apis/store_api_test.e | 2 +- .../elixir/lib/openapi_petstore/api/store.ex | 2 +- .../erlang-client/src/petstore_store_api.erl | 2 +- .../petstore/go/go-petstore/api/openapi.yaml | 4 +- .../petstore/go/go-petstore/api_store.go | 4 +- samples/client/petstore/go/user_api_test.go | 2 +- .../docs/OpenAPIPetstore-API-Store.html | 2 +- .../haskell-http-client/docs/linuwial.css | 2 +- .../haskell-http-client/docs/ocean.css | 2 +- .../docs/openapi-petstore.txt | 2 +- .../docs/src/OpenAPIPetstore.API.Store.html | 2 +- .../haskell-http-client/example-app/Main.hs | 4 +- .../lib/OpenAPIPetstore/API/Store.hs | 2 +- .../petstore/haskell-http-client/openapi.yaml | 4 +- .../java-helidon-client/mp/docs/FakeApi.md | 2 +- .../java-helidon-client/mp/docs/StoreApi.md | 2 +- .../org/openapitools/client/api/StoreApi.java | 2 +- .../openapitools/client/api/StoreApiTest.java | 2 +- .../java-helidon-client/se/docs/FakeApi.md | 2 +- .../java-helidon-client/se/docs/StoreApi.md | 2 +- .../org/openapitools/client/api/StoreApi.java | 2 +- .../openapitools/client/api/StoreApiTest.java | 2 +- .../docs/apis/StoreApi.md | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../org/openapitools/api/StoreApiSpec.groovy | 2 +- .../java/apache-httpclient/api/openapi.yaml | 4 +- .../java/apache-httpclient/docs/FakeApi.md | 2 +- .../java/apache-httpclient/docs/StoreApi.md | 2 +- .../org/openapitools/client/api/StoreApi.java | 2 +- .../openapitools/client/api/StoreApiTest.java | 2 +- .../java/feign-no-nullable/api/openapi.yaml | 4 +- .../org/openapitools/client/api/StoreApi.java | 4 +- .../openapitools/client/api/StoreApiTest.java | 2 +- .../petstore/java/feign/api/openapi.yaml | 4 +- .../java/feign/feign10x/api/openapi.yaml | 4 +- .../petstore/java/feign/feign10x/git_push.sh | 2 +- .../org/openapitools/client/ApiClient.java | 2 +- .../client/ServerConfiguration.java | 2 +- .../org/openapitools/client/api/StoreApi.java | 2 +- .../openapitools/client/api/StoreApiTest.java | 2 +- .../org/openapitools/client/api/StoreApi.java | 4 +- .../openapitools/client/api/StoreApiTest.java | 2 +- .../java/google-api-client/api/openapi.yaml | 4 +- .../java/google-api-client/docs/FakeApi.md | 2 +- .../java/google-api-client/docs/StoreApi.md | 2 +- .../org/openapitools/client/api/FakeApi.java | 4 +- .../org/openapitools/client/api/StoreApi.java | 4 +- .../openapitools/client/api/StoreApiTest.java | 2 +- .../petstore/java/jersey1/api/openapi.yaml | 4 +- .../petstore/java/jersey1/docs/FakeApi.md | 2 +- .../petstore/java/jersey1/docs/StoreApi.md | 2 +- .../org/openapitools/client/api/StoreApi.java | 2 +- .../openapitools/client/api/StoreApiTest.java | 2 +- .../api/openapi.yaml | 4 +- .../docs/FakeApi.md | 2 +- .../docs/StoreApi.md | 2 +- .../org/openapitools/client/api/FakeApi.java | 4 +- .../org/openapitools/client/api/StoreApi.java | 4 +- .../openapitools/client/api/StoreApiTest.java | 2 +- .../java/jersey2-java8/api/openapi.yaml | 4 +- .../java/jersey2-java8/docs/FakeApi.md | 2 +- .../java/jersey2-java8/docs/StoreApi.md | 2 +- .../org/openapitools/client/api/FakeApi.java | 4 +- .../org/openapitools/client/api/StoreApi.java | 4 +- .../openapitools/client/api/StoreApiTest.java | 2 +- .../petstore/java/jersey3/api/openapi.yaml | 4 +- .../petstore/java/jersey3/docs/FakeApi.md | 2 +- .../petstore/java/jersey3/docs/StoreApi.md | 2 +- .../org/openapitools/client/api/FakeApi.java | 4 +- .../org/openapitools/client/api/StoreApi.java | 4 +- .../client/JSONComposedSchemaTest.java | 6 +- .../openapitools/client/api/StoreApiTest.java | 2 +- .../docs/StoreApi.md | 2 +- .../org/openapitools/client/api/StoreApi.java | 2 +- .../openapitools/client/api/StoreApiTest.java | 2 +- .../microprofile-rest-client/docs/StoreApi.md | 2 +- .../org/openapitools/client/api/StoreApi.java | 2 +- .../openapitools/client/api/StoreApiTest.java | 2 +- .../java/native-async/api/openapi.yaml | 4 +- .../java/native-async/docs/FakeApi.md | 4 +- .../java/native-async/docs/StoreApi.md | 4 +- .../org/openapitools/client/api/StoreApi.java | 4 +- .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../openapitools/client/api/StoreApiTest.java | 2 +- .../petstore/java/native/api/openapi.yaml | 4 +- .../petstore/java/native/docs/FakeApi.md | 4 +- .../petstore/java/native/docs/StoreApi.md | 4 +- .../org/openapitools/client/api/StoreApi.java | 4 +- .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../openapitools/client/api/StoreApiTest.java | 2 +- .../docs/FakeApi.md | 2 +- .../docs/StoreApi.md | 2 +- .../org/openapitools/client/api/FakeApi.java | 10 +-- .../org/openapitools/client/api/StoreApi.java | 6 +- .../src/main/resources/openapi/openapi.yaml | 4 +- .../org/openapitools/client/JSONTest.java | 2 +- .../openapitools/client/api/StoreApiTest.java | 2 +- .../openapitools/client/model/Category.java | 2 +- .../client/model/ModelApiResponse.java | 2 +- .../org/openapitools/client/model/Order.java | 2 +- .../org/openapitools/client/model/Pet.java | 2 +- .../org/openapitools/client/model/Tag.java | 2 +- .../org/openapitools/client/model/User.java | 2 +- .../api/openapi.yaml | 4 +- .../docs/FakeApi.md | 2 +- .../docs/StoreApi.md | 2 +- .../org/openapitools/client/api/FakeApi.java | 10 +-- .../org/openapitools/client/api/StoreApi.java | 6 +- .../openapitools/client/api/StoreApiTest.java | 2 +- .../okhttp-gson-swagger1/api/openapi.yaml | 2 +- .../okhttp-gson-swagger1/docs/StoreApi.md | 2 +- .../org/openapitools/client/api/StoreApi.java | 6 +- .../openapitools/client/model/Category.java | 2 +- .../client/model/ModelApiResponse.java | 2 +- .../org/openapitools/client/model/Order.java | 2 +- .../org/openapitools/client/model/Pet.java | 2 +- .../org/openapitools/client/model/Tag.java | 2 +- .../org/openapitools/client/model/User.java | 2 +- .../openapitools/client/api/StoreApiTest.java | 2 +- .../java/okhttp-gson/api/openapi.yaml | 4 +- .../petstore/java/okhttp-gson/docs/FakeApi.md | 2 +- .../java/okhttp-gson/docs/StoreApi.md | 2 +- .../org/openapitools/client/api/FakeApi.java | 10 +-- .../org/openapitools/client/api/StoreApi.java | 6 +- .../model/AdditionalPropertiesClass.java | 2 +- .../org/openapitools/client/model/Apple.java | 2 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../client/model/ArrayOfInlineAllOf.java | 2 +- ...InlineAllOfArrayAllofDogPropertyInner.java | 2 +- ...eAllOfArrayAllofDogPropertyInnerAllOf.java | 2 +- ...AllOfArrayAllofDogPropertyInnerAllOf1.java | 2 +- .../client/model/ArrayOfNumberOnly.java | 2 +- .../openapitools/client/model/ArrayTest.java | 2 +- .../org/openapitools/client/model/Banana.java | 2 +- .../openapitools/client/model/BasquePig.java | 2 +- .../client/model/Capitalization.java | 2 +- .../org/openapitools/client/model/Cat.java | 2 +- .../openapitools/client/model/CatAllOf.java | 2 +- .../openapitools/client/model/Category.java | 2 +- .../openapitools/client/model/ClassModel.java | 2 +- .../org/openapitools/client/model/Client.java | 2 +- .../client/model/ComplexQuadrilateral.java | 2 +- .../openapitools/client/model/DanishPig.java | 2 +- .../client/model/DeprecatedObject.java | 2 +- .../org/openapitools/client/model/Dog.java | 2 +- .../openapitools/client/model/DogAllOf.java | 2 +- .../openapitools/client/model/EnumArrays.java | 2 +- .../client/model/EnumStringDiscriminator.java | 2 +- .../openapitools/client/model/EnumTest.java | 2 +- .../client/model/EquilateralTriangle.java | 2 +- .../client/model/FileSchemaTestClass.java | 2 +- .../org/openapitools/client/model/Foo.java | 2 +- .../client/model/FooGetDefaultResponse.java | 2 +- .../openapitools/client/model/FormatTest.java | 2 +- .../client/model/HasOnlyReadOnly.java | 2 +- .../client/model/HealthCheckResult.java | 2 +- .../openapitools/client/model/MapTest.java | 2 +- ...ropertiesAndAdditionalPropertiesClass.java | 2 +- .../client/model/Model200Response.java | 2 +- .../client/model/ModelApiResponse.java | 2 +- .../openapitools/client/model/ModelFile.java | 2 +- .../openapitools/client/model/ModelList.java | 2 +- .../client/model/ModelReturn.java | 2 +- .../org/openapitools/client/model/Name.java | 2 +- .../openapitools/client/model/NumberOnly.java | 2 +- .../model/ObjectWithDeprecatedFields.java | 2 +- .../org/openapitools/client/model/Order.java | 2 +- .../client/model/OuterComposite.java | 2 +- .../openapitools/client/model/ParentPet.java | 2 +- .../org/openapitools/client/model/Pet.java | 2 +- .../client/model/PetWithRequiredTags.java | 2 +- .../client/model/QuadrilateralInterface.java | 2 +- .../client/model/ReadOnlyFirst.java | 2 +- .../client/model/ScaleneTriangle.java | 2 +- .../client/model/ShapeInterface.java | 2 +- .../client/model/SimpleQuadrilateral.java | 2 +- .../client/model/SpecialModelName.java | 2 +- .../org/openapitools/client/model/Tag.java | 2 +- .../client/model/TriangleInterface.java | 2 +- .../org/openapitools/client/model/User.java | 2 +- .../org/openapitools/client/model/Whale.java | 2 +- .../org/openapitools/client/model/Zebra.java | 2 +- .../org/openapitools/client/JSONTest.java | 2 +- .../rest-assured-jackson/api/openapi.yaml | 4 +- .../rest-assured-jackson/docs/StoreApi.md | 2 +- .../org/openapitools/client/api/StoreApi.java | 2 +- .../openapitools/client/api/FakeApiTest.java | 2 +- .../java/rest-assured/api/openapi.yaml | 4 +- .../java/rest-assured/docs/StoreApi.md | 2 +- .../org/openapitools/client/api/StoreApi.java | 2 +- .../openapitools/client/api/FakeApiTest.java | 2 +- .../petstore/java/resteasy/api/openapi.yaml | 4 +- .../petstore/java/resteasy/docs/FakeApi.md | 2 +- .../petstore/java/resteasy/docs/StoreApi.md | 2 +- .../org/openapitools/client/api/StoreApi.java | 2 +- .../openapitools/client/api/StoreApiTest.java | 2 +- .../resttemplate-swagger1/api/openapi.yaml | 2 +- .../resttemplate-swagger1/docs/StoreApi.md | 2 +- .../org/openapitools/client/api/StoreApi.java | 4 +- .../openapitools/client/api/StoreApiTest.java | 2 +- .../resttemplate-withXml/api/openapi.yaml | 4 +- .../java/resttemplate-withXml/docs/FakeApi.md | 2 +- .../resttemplate-withXml/docs/StoreApi.md | 2 +- .../org/openapitools/client/api/FakeApi.java | 4 +- .../org/openapitools/client/api/StoreApi.java | 4 +- .../openapitools/client/api/StoreApiTest.java | 2 +- .../java/resttemplate/api/openapi.yaml | 4 +- .../java/resttemplate/docs/FakeApi.md | 2 +- .../java/resttemplate/docs/StoreApi.md | 2 +- .../org/openapitools/client/api/FakeApi.java | 4 +- .../org/openapitools/client/api/StoreApi.java | 4 +- .../openapitools/client/api/StoreApiTest.java | 2 +- .../java/retrofit2-play26/api/openapi.yaml | 4 +- .../java/retrofit2-play26/docs/FakeApi.md | 2 +- .../java/retrofit2-play26/docs/StoreApi.md | 2 +- .../org/openapitools/client/api/StoreApi.java | 2 +- .../openapitools/client/api/StoreApiTest.java | 2 +- .../petstore/java/retrofit2/api/openapi.yaml | 4 +- .../petstore/java/retrofit2/docs/FakeApi.md | 2 +- .../petstore/java/retrofit2/docs/StoreApi.md | 2 +- .../org/openapitools/client/api/StoreApi.java | 2 +- .../openapitools/client/api/StoreApiTest.java | 2 +- .../java/retrofit2rx2/api/openapi.yaml | 4 +- .../java/retrofit2rx2/docs/FakeApi.md | 2 +- .../java/retrofit2rx2/docs/StoreApi.md | 2 +- .../org/openapitools/client/api/StoreApi.java | 2 +- .../openapitools/client/api/StoreApiTest.java | 2 +- .../java/retrofit2rx3/api/openapi.yaml | 4 +- .../java/retrofit2rx3/docs/FakeApi.md | 2 +- .../java/retrofit2rx3/docs/StoreApi.md | 2 +- .../org/openapitools/client/api/StoreApi.java | 2 +- .../openapitools/client/api/StoreApiTest.java | 2 +- .../java/vertx-no-nullable/api/openapi.yaml | 4 +- .../java/vertx-no-nullable/docs/FakeApi.md | 2 +- .../java/vertx-no-nullable/docs/StoreApi.md | 2 +- .../openapitools/client/api/StoreApiImpl.java | 4 +- .../client/api/rxjava/StoreApi.java | 8 +-- .../openapitools/client/api/StoreApiTest.java | 2 +- .../petstore/java/vertx/api/openapi.yaml | 4 +- .../petstore/java/vertx/docs/FakeApi.md | 2 +- .../petstore/java/vertx/docs/StoreApi.md | 2 +- .../openapitools/client/api/StoreApiImpl.java | 4 +- .../client/api/rxjava/StoreApi.java | 8 +-- .../openapitools/client/api/StoreApiTest.java | 2 +- .../.github/workflows/maven.yml | 0 .../.gitignore | 0 .../.openapi-generator-ignore | 0 .../.openapi-generator/FILES | 0 .../.openapi-generator/VERSION | 0 .../.travis.yml | 0 .../README.md | 0 .../api/openapi.yaml | 0 .../build.gradle | 0 .../build.sbt | 0 .../docs/ByteArrayObject.md | 0 .../docs/DefaultApi.md | 0 .../git_push.sh | 0 .../gradle.properties | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../gradlew | 0 .../gradlew.bat | 0 .../pom.xml | 0 .../settings.gradle | 0 .../src/main/AndroidManifest.xml | 0 .../org/openapitools/client/ApiClient.java | 0 .../client/JavaTimeFormatter.java | 0 .../client/RFC3339DateFormat.java | 0 .../client/ServerConfiguration.java | 0 .../openapitools/client/ServerVariable.java | 0 .../org/openapitools/client/StringUtil.java | 0 .../openapitools/client/api/DefaultApi.java | 0 .../openapitools/client/auth/ApiKeyAuth.java | 0 .../client/auth/Authentication.java | 0 .../client/auth/HttpBasicAuth.java | 0 .../client/auth/HttpBearerAuth.java | 0 .../client/model/ByteArrayObject.java | 0 .../client/api/DefaultApiTest.java | 0 .../client/model/ByteArrayObjectTest.java | 0 .../petstore/java/webclient/api/openapi.yaml | 4 +- .../petstore/java/webclient/docs/FakeApi.md | 2 +- .../petstore/java/webclient/docs/StoreApi.md | 2 +- .../org/openapitools/client/api/FakeApi.java | 8 +-- .../org/openapitools/client/api/StoreApi.java | 8 +-- .../openapitools/client/api/StoreApiTest.java | 2 +- .../javascript-apollo/docs/StoreApi.md | 2 +- .../javascript-apollo/src/api/StoreApi.js | 2 +- .../javascript-apollo/src/model/Color.js | 6 +- .../javascript-apollo/src/model/Pig.js | 6 +- .../API/Client/StoreApi.js | 2 +- .../lib/goog/base.js | 10 +-- .../petstore/javascript-es6/docs/StoreApi.md | 2 +- .../javascript-es6/src/api/StoreApi.js | 2 +- .../javascript-es6/src/model/Color.js | 6 +- .../petstore/javascript-es6/src/model/Pig.js | 6 +- .../petstore/javascript-flowtyped/README.md | 2 +- .../petstore/javascript-flowtyped/lib/api.js | 4 +- .../javascript-flowtyped/lib/api.js.flow | 4 +- .../petstore/javascript-flowtyped/src/api.js | 4 +- .../javascript-promise-es6/docs/StoreApi.md | 2 +- .../src/api/StoreApi.js | 4 +- .../javascript-promise-es6/src/model/Color.js | 6 +- .../javascript-promise-es6/src/model/Pig.js | 6 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../org/openapitools/api/StoreApiTest.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../org/openapitools/api/StoreApiTest.java | 2 +- .../petstore/jmeter/.openapi-generator-ignore | 2 +- samples/client/petstore/jmeter/PetApi.jmx | 16 ++--- samples/client/petstore/jmeter/StoreApi.jmx | 10 +-- samples/client/petstore/jmeter/UserApi.jmx | 16 ++--- .../README.md | 4 +- .../client/request/RequestFactory.kt | 2 +- .../README.md | 4 +- .../client/request/RequestFactory.kt | 2 +- .../petstore/kotlin-gson/docs/StoreApi.md | 2 +- .../org/openapitools/client/apis/StoreApi.kt | 4 +- .../petstore/kotlin-jackson/docs/StoreApi.md | 2 +- .../org/openapitools/client/apis/StoreApi.kt | 4 +- .../docs/StoreApi.md | 2 +- .../org/openapitools/client/apis/StoreApi.kt | 4 +- .../kotlin-jvm-ktor-gson/docs/StoreApi.md | 2 +- .../org/openapitools/client/apis/StoreApi.kt | 2 +- .../kotlin-jvm-ktor-jackson/docs/StoreApi.md | 2 +- .../org/openapitools/client/apis/StoreApi.kt | 2 +- .../docs/StoreApi.md | 2 +- .../org/openapitools/client/apis/StoreApi.kt | 4 +- .../kotlin-jvm-vertx-gson/docs/StoreApi.md | 2 +- .../org/openapitools/client/apis/StoreApi.kt | 4 +- .../docs/StoreApi.md | 2 +- .../org/openapitools/client/apis/StoreApi.kt | 4 +- .../kotlin-jvm-vertx-jackson/docs/StoreApi.md | 2 +- .../org/openapitools/client/apis/StoreApi.kt | 4 +- .../kotlin-jvm-vertx-moshi/docs/StoreApi.md | 2 +- .../org/openapitools/client/apis/StoreApi.kt | 4 +- .../petstore/kotlin-jvm-volley/README.md | 4 +- .../kotlin-jvm-volley/docs/StoreApi.md | 2 +- .../org/openapitools/client/apis/StoreApi.kt | 2 +- .../client/request/RequestFactory.kt | 2 +- .../kotlin-modelMutable/docs/StoreApi.md | 2 +- .../org/openapitools/client/apis/StoreApi.kt | 4 +- .../kotlin-moshi-codegen/docs/StoreApi.md | 2 +- .../org/openapitools/client/apis/StoreApi.kt | 4 +- .../kotlin-multiplatform/docs/StoreApi.md | 2 +- .../org/openapitools/client/apis/StoreApi.kt | 2 +- .../kotlin-nonpublic/docs/StoreApi.md | 2 +- .../org/openapitools/client/apis/StoreApi.kt | 4 +- .../petstore/kotlin-nullable/docs/StoreApi.md | 2 +- .../org/openapitools/client/apis/StoreApi.kt | 4 +- .../petstore/kotlin-okhttp3/docs/StoreApi.md | 2 +- .../org/openapitools/client/apis/StoreApi.kt | 4 +- .../docs/StoreApi.md | 2 +- .../org/openapitools/client/apis/StoreApi.kt | 2 +- .../kotlin-retrofit2-rx3/docs/StoreApi.md | 2 +- .../org/openapitools/client/apis/StoreApi.kt | 2 +- .../kotlin-retrofit2/docs/StoreApi.md | 2 +- .../org/openapitools/client/apis/StoreApi.kt | 2 +- .../petstore/kotlin-string/docs/StoreApi.md | 2 +- .../org/openapitools/client/apis/StoreApi.kt | 4 +- .../kotlin-threetenbp/docs/StoreApi.md | 2 +- .../org/openapitools/client/apis/StoreApi.kt | 4 +- .../client/petstore/kotlin/docs/StoreApi.md | 2 +- .../org/openapitools/client/apis/StoreApi.kt | 4 +- .../core-data/SwaggerClient/Api/SWGStoreApi.h | 2 +- .../core-data/SwaggerClient/Api/SWGStoreApi.m | 2 +- .../objc/core-data/docs/SWGStoreApi.md | 2 +- .../default/SwaggerClient/Api/SWGStoreApi.h | 2 +- .../default/SwaggerClient/Api/SWGStoreApi.m | 2 +- .../petstore/objc/default/docs/SWGStoreApi.md | 2 +- samples/client/petstore/perl/docs/StoreApi.md | 2 +- .../client/petstore/perl/tests/01_pet_api.t | 2 +- samples/client/petstore/perl/tests/04_role.t | 2 +- .../petstore/perl/tests/05_long_module_name.t | 2 +- .../petstore/perl/tests/06_inheritance.t | 2 +- .../OpenAPIClient-php/docs/Api/StoreApi.md | 2 +- .../lib/ObjectSerializer.php | 4 +- .../tests/DateTimeSerializerTest.php | 4 +- .../OpenAPIClient-php/tests/OrderApiTest.php | 6 +- samples/client/petstore/powershell/Test1.ps1 | 2 +- .../petstore/powershell/docs/PSStoreApi.md | 2 +- .../Private/PSHttpSignatureAuth.ps1 | 2 +- .../powershell/tests/Petstore.Tests.ps1 | 2 +- .../petstore/python-asyncio/docs/FakeApi.md | 2 +- .../petstore/python-asyncio/docs/StoreApi.md | 2 +- .../petstore_api/api/store_api.py | 4 +- .../petstore/python-legacy/docs/FakeApi.md | 2 +- .../petstore/python-legacy/docs/StoreApi.md | 2 +- .../petstore_api/api/store_api.py | 4 +- .../petstore/python-prior/docs/FakeApi.md | 2 +- .../petstore/python-prior/docs/StoreApi.md | 2 +- .../petstore_api/api/store_api.py | 2 +- .../petstore_api/models/__init__.py | 2 +- .../python-prior/tests/test_api_client.py | 2 +- .../docs/FakeApi.md | 2 +- .../docs/StoreApi.md | 2 +- .../petstore_api/api/store_api.py | 2 +- .../petstore_api/models/__init__.py | 2 +- .../tests/test_api_client.py | 2 +- .../petstore/python-tornado/docs/FakeApi.md | 2 +- .../petstore/python-tornado/docs/StoreApi.md | 2 +- .../petstore_api/api/store_api.py | 4 +- .../petstore/ruby-autoload/docs/StoreApi.md | 2 +- .../lib/petstore/api/store_api.rb | 4 +- .../ruby-autoload/spec/api/store_api_spec.rb | 2 +- .../petstore/ruby-faraday/docs/StoreApi.md | 2 +- .../lib/petstore/api/store_api.rb | 4 +- .../ruby-faraday/spec/api/store_api_spec.rb | 2 +- .../ruby-faraday/spec/custom/pet_spec.rb | 4 +- samples/client/petstore/ruby/docs/StoreApi.md | 2 +- .../ruby/lib/petstore/api/store_api.rb | 4 +- .../petstore/ruby/spec/api/store_api_spec.rb | 2 +- .../petstore/ruby/spec/custom/pet_spec.rb | 2 +- .../rust/hyper/petstore/docs/StoreApi.md | 2 +- .../reqwest/petstore-async/docs/StoreApi.md | 2 +- .../petstore-async/src/apis/store_api.rs | 2 +- .../reqwest/petstore-async/tests/pet_tests.rs | 2 +- .../petstore-awsv4signature/docs/StoreApi.md | 2 +- .../src/apis/store_api.rs | 2 +- .../rust/reqwest/petstore/docs/StoreApi.md | 2 +- .../reqwest/petstore/src/apis/store_api.rs | 2 +- .../petstore/scala-akka/docs/StoreApi.md | 2 +- .../openapitools/client/api/StoreApi.scala | 2 +- .../openapitools/client/core/ApiInvoker.scala | 2 +- .../openapitools/example/api/StoreApi.scala | 4 +- .../openapitools/client/api/StoreApi.scala | 4 +- .../petstore/scala-httpclient/git_push.sh | 2 +- .../openapitools/client/api/StoreApi.scala | 4 +- .../openapitools/client/api/StoreApi.scala | 2 +- .../java/org/openapitools/api/StoreApi.java | 4 +- .../java/org/openapitools/api/DefaultApi.java | 4 +- .../java/org/openapitools/api/StoreApi.java | 4 +- .../java/org/openapitools/api/StoreApi.java | 4 +- .../java/org/openapitools/api/StoreApi.java | 4 +- .../java/org/openapitools/api/StoreApi.java | 4 +- .../java/org/openapitools/api/StoreApi.java | 4 +- .../Classes/OpenAPIs/APIHelper.swift | 2 +- .../Classes/OpenAPIs/APIs/PetAPI.swift | 2 +- .../Classes/OpenAPIs/APIs/StoreAPI.swift | 4 +- .../swift5/alamofireLibrary/docs/StoreAPI.md | 2 +- .../Classes/OpenAPIs/APIHelper.swift | 2 +- .../Classes/OpenAPIs/APIs/PetAPI.swift | 2 +- .../Classes/OpenAPIs/APIs/StoreAPI.swift | 4 +- .../swift5/asyncAwaitLibrary/docs/StoreAPI.md | 2 +- .../Classes/OpenAPIs/APIHelper.swift | 2 +- .../Classes/OpenAPIs/APIs/PetAPI.swift | 2 +- .../Classes/OpenAPIs/APIs/StoreAPI.swift | 4 +- .../swift5/combineLibrary/docs/StoreAPI.md | 2 +- .../Classes/OpenAPIs/APIHelper.swift | 2 +- .../Classes/OpenAPIs/APIs/PetAPI.swift | 2 +- .../Classes/OpenAPIs/APIs/StoreAPI.swift | 4 +- .../petstore/swift5/default/docs/StoreAPI.md | 2 +- .../Classes/OpenAPIs/APIHelper.swift | 2 +- .../Classes/OpenAPIs/APIs/PetAPI.swift | 2 +- .../Classes/OpenAPIs/APIs/StoreAPI.swift | 4 +- .../swift5/deprecated/docs/StoreAPI.md | 2 +- .../Classes/OpenAPIs/APIHelper.swift | 2 +- .../Classes/OpenAPIs/APIs/PetAPI.swift | 2 +- .../Classes/OpenAPIs/APIs/StoreAPI.swift | 4 +- .../swift5/frozenEnums/docs/StoreAPI.md | 2 +- .../Classes/OpenAPIs/APIHelper.swift | 2 +- .../Classes/OpenAPIs/APIs/PetAPI.swift | 2 +- .../Classes/OpenAPIs/APIs/StoreAPI.swift | 4 +- .../swift5/nonPublicApi/docs/StoreAPI.md | 2 +- .../Classes/OpenAPIs/APIHelper.swift | 2 +- .../Classes/OpenAPIs/APIs/PetAPI.swift | 2 +- .../Classes/OpenAPIs/APIs/StoreAPI.swift | 4 +- .../swift5/objcCompatible/docs/StoreAPI.md | 2 +- .../Classes/OpenAPIs/APIHelper.swift | 2 +- .../Classes/OpenAPIs/APIHelper.swift | 2 +- .../Classes/OpenAPIs/APIs/PetAPI.swift | 2 +- .../Classes/OpenAPIs/APIs/StoreAPI.swift | 4 +- .../swift5/promisekitLibrary/docs/StoreAPI.md | 2 +- .../Classes/OpenAPIs/APIHelper.swift | 2 +- .../Classes/OpenAPIs/APIs/PetAPI.swift | 2 +- .../Classes/OpenAPIs/APIs/StoreAPI.swift | 4 +- .../readonlyProperties/docs/StoreAPI.md | 2 +- .../Classes/OpenAPIs/APIHelper.swift | 2 +- .../Classes/OpenAPIs/APIs/PetAPI.swift | 2 +- .../Classes/OpenAPIs/APIs/StoreAPI.swift | 4 +- .../swift5/resultLibrary/docs/StoreAPI.md | 2 +- .../Classes/OpenAPIs/APIHelper.swift | 2 +- .../Classes/OpenAPIs/APIs/PetAPI.swift | 2 +- .../Classes/OpenAPIs/APIs/StoreAPI.swift | 4 +- .../swift5/rxswiftLibrary/docs/StoreAPI.md | 2 +- .../Sources/PetstoreClient/APIHelper.swift | 2 +- .../Sources/PetstoreClient/APIs/PetAPI.swift | 2 +- .../PetstoreClient/APIs/StoreAPI.swift | 4 +- .../swift5/urlsessionLibrary/docs/StoreAPI.md | 2 +- .../Sources/PetstoreClient/APIs/PetAPI.swift | 4 +- .../PetstoreClient/APIs/StoreAPI.swift | 8 +-- .../swift5/vaporLibrary/docs/StoreAPI.md | 2 +- .../Classes/OpenAPIs/APIHelper.swift | 2 +- .../Classes/OpenAPIs/APIs/PetAPI.swift | 2 +- .../Classes/OpenAPIs/APIs/StoreAPI.swift | 4 +- .../swift5/x-swift-hashable/docs/StoreAPI.md | 2 +- samples/client/petstore/tiny/cpp/README.md | 2 +- .../petstore/tiny/cpp/lib/service/StoreApi.h | 2 +- .../builds/default/api/store.service.ts | 2 +- .../builds/default/api/store.service.ts | 2 +- .../builds/with-npm/api/store.service.ts | 2 +- .../pom.xml | 2 +- .../builds/default/api/store.service.ts | 2 +- .../builds/default/api/store.service.ts | 2 +- .../builds/with-npm/api/store.service.ts | 2 +- .../builds/default/api/store.service.ts | 2 +- .../builds/with-npm/api/store.service.ts | 2 +- .../api/store.service.ts | 2 +- .../typescript-aurelia/default/README.md | 2 +- .../typescript-aurelia/default/StoreApi.ts | 2 +- .../typescript-axios/builds/default/api.ts | 8 +-- .../typescript-axios/builds/es6-target/api.ts | 8 +-- .../builds/test-petstore/api.ts | 8 +-- .../builds/with-complex-headers/api.ts | 8 +-- .../api.ts | 8 +-- .../builds/with-interfaces/api.ts | 10 +-- .../builds/with-node-imports/api.ts | 8 +-- .../api/another/level/store-api.ts | 8 +-- .../builds/with-npm-version/api.ts | 8 +-- .../builds/with-npm-version/pom.xml | 2 +- .../with-single-request-parameters/api.ts | 8 +-- .../builds/with-string-enums/api.ts | 8 +-- .../typescript-axios/tests/default/pom.xml | 2 +- .../builds/allOf-readonly/runtime.ts | 14 ++-- .../builds/default-v3.0/apis/StoreApi.ts | 4 +- .../builds/default-v3.0/runtime.ts | 14 ++-- .../builds/default/apis/StoreApi.ts | 4 +- .../typescript-fetch/builds/default/pom.xml | 2 +- .../builds/default/runtime.ts | 14 ++-- .../typescript-fetch/builds/enum/runtime.ts | 14 ++-- .../builds/es6-target/pom.xml | 2 +- .../builds/es6-target/src/apis/StoreApi.ts | 4 +- .../builds/es6-target/src/runtime.ts | 14 ++-- .../multiple-parameters/apis/StoreApi.ts | 4 +- .../builds/multiple-parameters/pom.xml | 2 +- .../builds/multiple-parameters/runtime.ts | 14 ++-- .../prefix-parameter-interfaces/pom.xml | 2 +- .../src/apis/StoreApi.ts | 4 +- .../src/runtime.ts | 14 ++-- .../sagas-and-records/src/apis/StoreApi.ts | 4 +- .../builds/sagas-and-records/src/runtime.ts | 14 ++-- .../builds/with-interfaces/apis/StoreApi.ts | 8 +-- .../builds/with-interfaces/runtime.ts | 14 ++-- .../builds/with-npm-version/pom.xml | 2 +- .../with-npm-version/src/apis/StoreApi.ts | 4 +- .../builds/with-npm-version/src/runtime.ts | 14 ++-- .../builds/with-string-enums/runtime.ts | 14 ++-- .../src/apis/StoreApi.ts | 4 +- .../without-runtime-checks/src/runtime.ts | 14 ++-- .../typescript-fetch/tests/default/pom.xml | 2 +- .../typescript-inversify/api/store.service.ts | 2 +- .../typescript-jquery/default/api/StoreApi.ts | 2 +- .../typescript-jquery/npm/api/StoreApi.ts | 2 +- .../builds/default/api/store.service.ts | 2 +- .../builds/default/api/store.service.ts | 2 +- .../typescript-node/default/api/storeApi.ts | 2 +- .../typescript-node/npm/api/storeApi.ts | 2 +- .../petstore/typescript-node/npm/pom.xml | 2 +- .../builds/default/src/apis/StoreApi.ts | 4 +- .../with-npm-version/src/apis/StoreApi.ts | 4 +- .../builds/default/apis/StoreApi.ts | 2 +- .../builds/es6-target/apis/StoreApi.ts | 2 +- .../builds/with-npm-version/apis/StoreApi.ts | 2 +- .../with-progress-subscriber/apis/StoreApi.ts | 2 +- .../apache2/.openapi-generator-ignore | 2 +- .../petstore/api/store_api.graphql | 2 +- .../config/petstore/protobuf-schema/README.md | 6 +- samples/documentation/asciidoc/index.adoc | 2 +- .../documentation/cwiki/confluence-markup.txt | 2 +- .../dynamic-html/docs/assets/css/style.css | 2 +- .../docs/operations/StoreApi.html | 2 +- samples/documentation/html/index.html | 2 +- samples/documentation/html2/index.html | 2 +- .../documentation/markdown/Apis/StoreApi.md | 2 +- .../client/3_0_3_unit_test/python/git_push.sh | 2 +- .../test_object_properties_validation.py | 22 +++--- .../test_post.py | 68 +++++++++--------- .../test_post.py | 68 +++++++++--------- .../python/unit_test_api/models/__init__.py | 2 +- .../python/unit_test_api/schemas.py | 34 ++++----- samples/openapi3/client/elm/src/Api/Data.elm | 6 +- .../x_auth_id_alias/models/__init__.py | 2 +- .../python/dynamic_servers/models/__init__.py | 2 +- .../python/dynamic_servers/schemas.py | 34 ++++----- .../dynamic-servers/python/git_push.sh | 2 +- .../lib/src/model/addressable.dart | 2 +- .../doc/StoreApi.md | 2 +- .../lib/src/api/store_api.dart | 2 +- .../test/store_api_test.dart | 2 +- .../petstore_client_lib_fake/doc/StoreApi.md | 2 +- .../lib/src/api/store_api.dart | 2 +- .../test/store_api_test.dart | 2 +- .../dart2/petstore_client_lib/doc/StoreApi.md | 2 +- .../lib/api/store_api.dart | 4 +- .../test/store_api_test.dart | 2 +- .../petstore_client_lib_fake/doc/StoreApi.md | 2 +- .../lib/api/store_api.dart | 4 +- .../test/store_api_test.dart | 2 +- .../client/petstore/elm/src/Request/Store.elm | 2 +- .../petstore/go/go-petstore/api/openapi.yaml | 6 +- .../petstore/go/go-petstore/api_store.go | 4 +- .../client/petstore/go/http_signature_test.go | 2 +- .../openapi3/client/petstore/go/model_test.go | 4 +- .../client/petstore/go/user_api_test.go | 2 +- .../jersey2-java8-swagger1/api/openapi.yaml | 2 +- .../jersey2-java8-swagger1/docs/StoreApi.md | 2 +- .../org/openapitools/client/api/StoreApi.java | 4 +- .../openapitools/client/api/StoreApiTest.java | 2 +- .../java/jersey2-java8/api/openapi.yaml | 4 +- .../java/jersey2-java8/docs/FakeApi.md | 2 +- .../java/jersey2-java8/docs/StoreApi.md | 2 +- .../org/openapitools/client/api/FakeApi.java | 4 +- .../org/openapitools/client/api/StoreApi.java | 4 +- .../client/JSONComposedSchemaTest.java | 6 +- .../openapitools/client/api/StoreApiTest.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../org/openapitools/api/StoreApiTest.java | 2 +- .../kotlin-deprecated/docs/StoreApi.md | 2 +- .../org/openapitools/client/apis/StoreApi.kt | 2 +- .../docs/StoreApi.md | 2 +- .../org/openapitools/client/apis/FakeApi.kt | 2 +- .../org/openapitools/client/apis/StoreApi.kt | 2 +- .../kotlin-jvm-retrofit2-rx/docs/StoreApi.md | 2 +- .../org/openapitools/client/apis/FakeApi.kt | 2 +- .../org/openapitools/client/apis/StoreApi.kt | 2 +- .../kotlin-jvm-retrofit2-rx2/docs/StoreApi.md | 2 +- .../org/openapitools/client/apis/FakeApi.kt | 2 +- .../org/openapitools/client/apis/StoreApi.kt | 2 +- .../kotlin-multiplatform/docs/StoreApi.md | 2 +- .../org/openapitools/client/apis/StoreApi.kt | 2 +- .../client/petstore/kotlin/docs/StoreApi.md | 2 +- .../org/openapitools/client/apis/StoreApi.kt | 2 +- .../petstore/python-legacy/docs/FakeApi.md | 2 +- .../petstore/python-legacy/docs/StoreApi.md | 2 +- .../petstore_api/api/store_api.py | 4 +- .../petstore/python-prior/docs/FakeApi.md | 2 +- .../petstore/python-prior/docs/FruitReq.md | 2 +- .../petstore/python-prior/docs/StoreApi.md | 2 +- .../petstore_api/api/store_api.py | 2 +- .../petstore_api/models/__init__.py | 2 +- .../tests_manual/test_deserialization.py | 2 +- .../tests_manual/test_http_signature.py | 10 +-- .../openapi3/client/petstore/python/README.md | 2 +- .../petstore/python/docs/apis/tags/FakeApi.md | 4 +- .../python/docs/apis/tags/StoreApi.md | 2 +- .../client/petstore/python/git_push.sh | 2 +- .../python/petstore_api/api_client.py | 4 +- .../python/petstore_api/apis/path_to_api.py | 6 +- .../apis/paths/fake_test_query_parameters.py | 7 ++ .../apis/paths/fake_test_query_paramters.py | 7 -- .../python/petstore_api/apis/tags/fake_api.py | 2 +- .../python/petstore_api/configuration.py | 4 +- .../python/petstore_api/models/__init__.py | 2 +- .../python/petstore_api/paths/__init__.py | 2 +- .../__init__.py | 4 +- .../put.py | 0 .../put.pyi | 0 .../petstore/python/petstore_api/schemas.py | 34 ++++----- .../petstore/python/petstore_api/signing.py | 2 +- .../__init__.py | 0 .../test_put.py | 6 +- .../tests_manual/test_deserialization.py | 2 +- .../tests_manual/test_http_signature.py | 10 +-- ..._with_req_test_prop_from_unset_add_prop.py | 2 +- .../python/tests_manual/test_request_body.py | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/DefaultApi.java | 4 +- .../java/org/openapitools/api/FakeApi.java | 4 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../typescript/builds/browser/StoreApi.md | 2 +- .../builds/browser/apis/StoreApi.ts | 2 +- .../builds/browser/types/ObjectParamAPI.ts | 2 +- .../builds/browser/types/ObservableAPI.ts | 2 +- .../builds/browser/types/PromiseAPI.ts | 2 +- .../typescript/builds/default/StoreApi.md | 2 +- .../builds/default/apis/StoreApi.ts | 2 +- .../builds/default/types/ObjectParamAPI.ts | 2 +- .../builds/default/types/ObservableAPI.ts | 2 +- .../builds/default/types/PromiseAPI.ts | 2 +- .../typescript/builds/deno/StoreApi.md | 2 +- .../typescript/builds/deno/apis/StoreApi.ts | 2 +- .../builds/deno/types/ObjectParamAPI.ts | 2 +- .../builds/deno/types/ObservableAPI.ts | 2 +- .../builds/deno/types/PromiseAPI.ts | 2 +- .../typescript/builds/inversify/StoreApi.md | 2 +- .../builds/inversify/apis/StoreApi.ts | 2 +- .../inversify/services/ObjectParamAPI.ts | 2 +- .../builds/inversify/types/ObjectParamAPI.ts | 2 +- .../builds/inversify/types/ObservableAPI.ts | 2 +- .../builds/inversify/types/PromiseAPI.ts | 2 +- .../typescript/builds/jquery/StoreApi.md | 2 +- .../typescript/builds/jquery/apis/StoreApi.ts | 2 +- .../builds/jquery/types/APIInterfaces.ts | 2 +- .../builds/jquery/types/ObjectParamAPI.ts | 2 +- .../builds/jquery/types/ObservableAPI.ts | 2 +- .../builds/jquery/types/PromiseAPI.ts | 2 +- .../builds/object_params/StoreApi.md | 2 +- .../builds/object_params/apis/StoreApi.ts | 2 +- .../object_params/types/ObjectParamAPI.ts | 2 +- .../object_params/types/ObservableAPI.ts | 2 +- .../builds/object_params/types/PromiseAPI.ts | 2 +- .../tests/browser/test/PetApi.test.ts | 8 +-- .../tests/default/test/api/PetApi.test.ts | 8 +-- .../kotlin/org/openapitools/api/StoreApi.kt | 2 +- .../org/openapitools/api/StoreApiTest.kt | 2 +- .../kotlin/org/openapitools/api/StoreApi.kt | 2 +- .../org/openapitools/api/StoreApiTest.kt | 2 +- .../Resources/docs/Api/StoreApiInterface.md | 2 +- .../petstore/python-flask-python2/git_push.sh | 2 +- .../controllers/store_controller.py | 2 +- .../openapi_server/openapi/openapi.yaml | 4 +- .../test/test_pet_controller.py | 4 +- .../server/petstore/python-flask/git_push.sh | 2 +- .../controllers/store_controller.py | 2 +- .../openapi_server/openapi/openapi.yaml | 4 +- .../test/test_pet_controller.py | 4 +- .../org/openapitools/model/Addressable.java | 4 +- .../src/main/resources/openapi.yaml | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/resources/openapi.yaml | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/resources/openapi.yaml | 2 +- .../java/org/openapitools/api/FakeApi.java | 4 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/resources/openapi.yaml | 4 +- .../java/org/openapitools/api/FakeApi.java | 4 +- .../org/openapitools/api/FakeApiDelegate.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiDelegate.java | 2 +- .../src/main/resources/openapi.yaml | 4 +- .../java/org/openapitools/api/FakeApi.java | 4 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/resources/openapi.yaml | 4 +- .../java/org/openapitools/api/FakeApi.java | 4 +- .../org/openapitools/api/FakeApiDelegate.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/StoreApiDelegate.java | 2 +- .../src/main/resources/openapi.yaml | 4 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/resources/openapi.yaml | 2 +- .../java/org/openapitools/api/FakeApi.java | 4 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/resources/openapi.yaml | 4 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/resources/openapi.yaml | 2 +- .../schema/petstore/wsdl-schema/service.wsdl | 2 +- .../Org.OpenAPITools/Controllers/StoreApi.cs | 2 +- .../wwwroot/openapi-original.json | 2 +- .../Org.OpenAPITools/Controllers/StoreApi.cs | 2 +- .../wwwroot/openapi-original.json | 2 +- .../Org.OpenAPITools/Controllers/StoreApi.cs | 2 +- .../wwwroot/openapi-original.json | 2 +- .../Org.OpenAPITools/Controllers/StoreApi.cs | 2 +- .../wwwroot/openapi-original.json | 2 +- .../Org.OpenAPITools/Controllers/StoreApi.cs | 2 +- .../wwwroot/openapi-original.json | 2 +- .../Org.OpenAPITools/Controllers/StoreApi.cs | 2 +- .../wwwroot/openapi-original.json | 2 +- .../Org.OpenAPITools/Controllers/StoreApi.cs | 2 +- .../wwwroot/openapi-original.json | 2 +- .../Org.OpenAPITools/Controllers/StoreApi.cs | 2 +- .../wwwroot/openapi-original.json | 4 +- .../petstore/cpp-pistache/api/StoreApi.h | 2 +- .../cpp-restbed/generated/3_0/api/FakeApi.cpp | 2 +- .../src/test/java/helper/TestingHelper.java | 4 +- .../petstore/erlang-server/priv/openapi.json | 2 +- .../petstore/go-api-server/api/openapi.yaml | 2 +- .../petstore/go-chi-server/api/openapi.yaml | 2 +- .../go-echo-server/.docs/api/openapi.yaml | 2 +- .../go-gin-api-server/api/openapi.yaml | 2 +- .../go-server-required/api/openapi.yaml | 2 +- .../docs/store_api.md | 2 +- .../petstore/api/store_api.graphql | 2 +- .../lib/OpenAPIPetstore/API.hs | 2 +- .../haskell-yesod/src/Handler/Store.hs | 2 +- .../src/main/resources/META-INF/openapi.yml | 4 +- .../src/main/resources/META-INF/openapi.yml | 4 +- .../src/main/openapi/openapi.yaml | 4 +- .../docs/controllers/StoreController.md | 2 +- .../controller/StoreController.java | 2 +- .../controller/StoreControllerSpec.groovy | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- samples/server/petstore/java-pkmst/Readme.md | 4 +- .../pkmst/controller/PetApiController.java | 2 +- .../prokarma/pkmst/controller/StoreApi.java | 2 +- .../pkmst/controller/StoreApiController.java | 2 +- .../pkmst/controller/UserApiController.java | 2 +- .../pkmst/controller/StoreApiTest.java | 2 +- .../public/openapi.json | 2 +- .../public/openapi.json | 2 +- .../public/openapi.json | 2 +- .../public/openapi.json | 2 +- .../public/openapi.json | 4 +- .../public/openapi.json | 2 +- .../public/openapi.json | 2 +- .../public/openapi.json | 2 +- .../public/openapi.json | 2 +- .../public/openapi.json | 2 +- .../java-play-framework/public/openapi.json | 2 +- .../handler/PathHandlerInterface.java | 2 +- .../src/main/resources/config/openapi.json | 2 +- .../src/main/resources/openapi.yaml | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../api/impl/StoreApiServiceImpl.java | 2 +- .../org/openapitools/api/StoreApiTest.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../api/impl/StoreApiServiceImpl.java | 2 +- .../org/openapitools/api/StoreApiTest.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../api/impl/StoreApiServiceImpl.java | 2 +- .../org/openapitools/api/StoreApiTest.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../api/impl/StoreApiServiceImpl.java | 2 +- .../org/openapitools/api/StoreApiTest.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../jaxrs-spec-interface-response/README.md | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/openapi/openapi.yaml | 4 +- .../petstore/jaxrs-spec-interface/README.md | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/openapi/openapi.yaml | 4 +- samples/server/petstore/jaxrs-spec/README.md | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../jaxrs-spec/src/main/openapi/openapi.yaml | 4 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../kotlin/org/openapitools/server/Paths.kt | 2 +- .../kotlin/org/openapitools/server/Paths.kt | 2 +- .../kotlin/org/openapitools/api/StoreApi.kt | 2 +- .../src/main/resources/openapi.yaml | 2 +- .../openapitools/api/StoreApiController.kt | 2 +- .../org/openapitools/api/StoreApiService.kt | 2 +- .../src/main/resources/openapi.yaml | 2 +- .../openapitools/api/StoreApiController.kt | 2 +- .../org/openapitools/api/StoreApiService.kt | 2 +- .../src/main/resources/openapi.yaml | 2 +- .../openapitools/api/StoreApiController.kt | 2 +- .../org/openapitools/api/StoreApiService.kt | 2 +- .../src/main/resources/openapi.yaml | 2 +- .../openapitools/api/StoreApiController.kt | 2 +- .../org/openapitools/api/StoreApiService.kt | 2 +- .../src/main/resources/openapi.yaml | 2 +- .../openapitools/api/StoreApiController.kt | 2 +- .../org/openapitools/api/StoreApiService.kt | 2 +- .../src/main/resources/openapi.yaml | 2 +- .../org/openapitools/api/StoreApiService.kt | 2 +- .../petstore/nodejs-express-server/README.md | 4 +- .../nodejs-express-server/api/openapi.yaml | 4 +- .../controllers/Controller.js | 2 +- .../controllers/PetController.js | 2 +- .../controllers/StoreController.js | 2 +- .../controllers/UserController.js | 2 +- .../services/StoreService.js | 2 +- .../utils/openapiRouter.js | 6 +- .../petstore/php-laravel/lib/routes/api.php | 2 +- .../petstore/php-lumen/lib/routes/web.php | 2 +- .../php-slim4/lib/Api/AbstractStoreApi.php | 2 +- samples/server/petstore/php-slim4/pom.xml | 2 +- .../docs/Api/StoreApiInterface.md | 2 +- .../python-aiohttp-srclayout/README.md | 2 +- .../controllers/store_controller.py | 2 +- .../src/openapi_server/openapi/openapi.yaml | 2 +- .../tests/test_pet_controller.py | 4 +- .../server/petstore/python-aiohttp/README.md | 2 +- .../controllers/store_controller.py | 2 +- .../openapi_server/openapi/openapi.yaml | 2 +- .../controllers/store_controller.py | 2 +- .../petstore/python-fastapi/openapi.yaml | 2 +- .../src/openapi_server/apis/store_api.py | 2 +- .../controllers/store_controller.py | 2 +- .../openapi_server/openapi/openapi.yaml | 2 +- samples/server/petstore/ruby-on-rails/pom.xml | 2 +- .../petstore/ruby-sinatra/api/store_api.rb | 2 +- .../server/petstore/ruby-sinatra/openapi.yaml | 4 +- .../output/no-example-v3/api/openapi.yaml | 2 +- .../output/no-example-v3/docs/InlineObject.md | 2 +- .../no-example-v3/docs/InlineRequest.md | 2 +- .../output/no-example-v3/docs/OpGetRequest.md | 2 +- .../output/no-example-v3/src/models.rs | 23 +++--- .../output/openapi-v3/src/models.rs | 8 +-- .../api/openapi.yaml | 2 +- .../docs/store_api.md | 2 +- .../src/models.rs | 4 +- .../output/rust-server-test/api/openapi.yaml | 2 +- .../rust-server-test/docs/AllOfObject.md | 2 +- .../output/rust-server-test/docs/BaseAllOf.md | 2 +- .../output/rust-server-test/src/models.rs | 36 +++++----- .../.openapi-generator-ignore | 2 +- .../scala/io/swagger/client/api/PetApi.scala | 2 +- .../io/swagger/client/api/StoreApi.scala | 2 +- .../scala-play-server/app/api/StoreApi.scala | 2 +- .../scala-play-server/public/openapi.json | 4 +- .../scalatra/src/main/webapp/WEB-INF/web.xml | 2 +- .../java/org/openapitools/api/FakeApi.java | 4 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 4 +- .../java/org/openapitools/api/FakeApi.java | 4 +- .../java/org/openapitools/api/StoreApi.java | 4 +- .../src/main/resources/openapi.yaml | 4 +- .../java/org/openapitools/api/FakeApi.java | 4 +- .../java/org/openapitools/api/StoreApi.java | 4 +- .../src/main/resources/openapi.yaml | 4 +- .../java/org/openapitools/api/FakeApi.java | 4 +- .../org/openapitools/api/FakeApiDelegate.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 4 +- .../openapitools/api/StoreApiDelegate.java | 2 +- .../src/main/resources/openapi.yaml | 4 +- .../java/org/openapitools/api/FakeApi.java | 4 +- .../org/openapitools/api/FakeApiDelegate.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 4 +- .../openapitools/api/StoreApiDelegate.java | 2 +- .../src/main/resources/openapi.yaml | 4 +- .../java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/resources/openapi.yaml | 2 +- .../java/org/openapitools/api/FakeApi.java | 4 +- .../java/org/openapitools/api/StoreApi.java | 4 +- .../src/main/resources/openapi.yaml | 4 +- .../java/org/openapitools/api/FakeApi.java | 4 +- .../org/openapitools/api/FakeApiDelegate.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 4 +- .../openapitools/api/StoreApiDelegate.java | 2 +- .../src/main/resources/openapi.yaml | 4 +- .../java/org/openapitools/api/FakeApi.java | 4 +- .../org/openapitools/api/FakeApiDelegate.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 4 +- .../openapitools/api/StoreApiDelegate.java | 2 +- .../src/main/resources/openapi.yaml | 4 +- .../java/org/openapitools/api/FakeApi.java | 4 +- .../org/openapitools/api/FakeApiDelegate.java | 2 +- .../java/org/openapitools/api/StoreApi.java | 4 +- .../openapitools/api/StoreApiDelegate.java | 2 +- .../src/main/resources/openapi.yaml | 4 +- .../java/org/openapitools/api/FakeApi.java | 4 +- .../java/org/openapitools/api/StoreApi.java | 4 +- .../src/main/resources/openapi.yaml | 4 +- .../java/org/openapitools/api/FakeApi.java | 4 +- .../java/org/openapitools/api/StoreApi.java | 4 +- .../src/main/resources/openapi.yaml | 4 +- .../java/org/openapitools/api/FakeApi.java | 4 +- .../java/org/openapitools/api/StoreApi.java | 4 +- .../src/main/resources/openapi.yaml | 4 +- .../openapitools/virtualan/api/FakeApi.java | 4 +- .../openapitools/virtualan/api/StoreApi.java | 2 +- .../src/main/resources/openapi.yaml | 4 +- .../java/org/openapitools/api/FakeApi.java | 4 +- .../java/org/openapitools/api/StoreApi.java | 4 +- .../src/main/resources/openapi.yaml | 4 +- 1449 files changed, 2576 insertions(+), 2581 deletions(-) rename modules/openapi-generator/src/test/resources/3_0/{petstore-with-depreacted-fields.yaml => petstore-with-deprecated-fields.yaml} (99%) rename samples/client/petstore/java/{webclient-nulable-arrays => webclient-nullable-arrays}/.github/workflows/maven.yml (100%) rename samples/client/petstore/java/{webclient-nulable-arrays => webclient-nullable-arrays}/.gitignore (100%) rename samples/client/petstore/java/{webclient-nulable-arrays => webclient-nullable-arrays}/.openapi-generator-ignore (100%) rename samples/client/petstore/java/{webclient-nulable-arrays => webclient-nullable-arrays}/.openapi-generator/FILES (100%) rename samples/client/petstore/java/{webclient-nulable-arrays => webclient-nullable-arrays}/.openapi-generator/VERSION (100%) rename samples/client/petstore/java/{webclient-nulable-arrays => webclient-nullable-arrays}/.travis.yml (100%) rename samples/client/petstore/java/{webclient-nulable-arrays => webclient-nullable-arrays}/README.md (100%) rename samples/client/petstore/java/{webclient-nulable-arrays => webclient-nullable-arrays}/api/openapi.yaml (100%) rename samples/client/petstore/java/{webclient-nulable-arrays => webclient-nullable-arrays}/build.gradle (100%) rename samples/client/petstore/java/{webclient-nulable-arrays => webclient-nullable-arrays}/build.sbt (100%) rename samples/client/petstore/java/{webclient-nulable-arrays => webclient-nullable-arrays}/docs/ByteArrayObject.md (100%) rename samples/client/petstore/java/{webclient-nulable-arrays => webclient-nullable-arrays}/docs/DefaultApi.md (100%) rename samples/client/petstore/java/{webclient-nulable-arrays => webclient-nullable-arrays}/git_push.sh (100%) rename samples/client/petstore/java/{webclient-nulable-arrays => webclient-nullable-arrays}/gradle.properties (100%) rename samples/client/petstore/java/{webclient-nulable-arrays => webclient-nullable-arrays}/gradle/wrapper/gradle-wrapper.jar (100%) rename samples/client/petstore/java/{webclient-nulable-arrays => webclient-nullable-arrays}/gradle/wrapper/gradle-wrapper.properties (100%) rename samples/client/petstore/java/{webclient-nulable-arrays => webclient-nullable-arrays}/gradlew (100%) rename samples/client/petstore/java/{webclient-nulable-arrays => webclient-nullable-arrays}/gradlew.bat (100%) rename samples/client/petstore/java/{webclient-nulable-arrays => webclient-nullable-arrays}/pom.xml (100%) rename samples/client/petstore/java/{webclient-nulable-arrays => webclient-nullable-arrays}/settings.gradle (100%) rename samples/client/petstore/java/{webclient-nulable-arrays => webclient-nullable-arrays}/src/main/AndroidManifest.xml (100%) rename samples/client/petstore/java/{webclient-nulable-arrays => webclient-nullable-arrays}/src/main/java/org/openapitools/client/ApiClient.java (100%) rename samples/client/petstore/java/{webclient-nulable-arrays => webclient-nullable-arrays}/src/main/java/org/openapitools/client/JavaTimeFormatter.java (100%) rename samples/client/petstore/java/{webclient-nulable-arrays => webclient-nullable-arrays}/src/main/java/org/openapitools/client/RFC3339DateFormat.java (100%) rename samples/client/petstore/java/{webclient-nulable-arrays => webclient-nullable-arrays}/src/main/java/org/openapitools/client/ServerConfiguration.java (100%) rename samples/client/petstore/java/{webclient-nulable-arrays => webclient-nullable-arrays}/src/main/java/org/openapitools/client/ServerVariable.java (100%) rename samples/client/petstore/java/{webclient-nulable-arrays => webclient-nullable-arrays}/src/main/java/org/openapitools/client/StringUtil.java (100%) rename samples/client/petstore/java/{webclient-nulable-arrays => webclient-nullable-arrays}/src/main/java/org/openapitools/client/api/DefaultApi.java (100%) rename samples/client/petstore/java/{webclient-nulable-arrays => webclient-nullable-arrays}/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java (100%) rename samples/client/petstore/java/{webclient-nulable-arrays => webclient-nullable-arrays}/src/main/java/org/openapitools/client/auth/Authentication.java (100%) rename samples/client/petstore/java/{webclient-nulable-arrays => webclient-nullable-arrays}/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java (100%) rename samples/client/petstore/java/{webclient-nulable-arrays => webclient-nullable-arrays}/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java (100%) rename samples/client/petstore/java/{webclient-nulable-arrays => webclient-nullable-arrays}/src/main/java/org/openapitools/client/model/ByteArrayObject.java (100%) rename samples/client/petstore/java/{webclient-nulable-arrays => webclient-nullable-arrays}/src/test/java/org/openapitools/client/api/DefaultApiTest.java (100%) rename samples/client/petstore/java/{webclient-nulable-arrays => webclient-nullable-arrays}/src/test/java/org/openapitools/client/model/ByteArrayObjectTest.java (100%) create mode 100644 samples/openapi3/client/petstore/python/petstore_api/apis/paths/fake_test_query_parameters.py delete mode 100644 samples/openapi3/client/petstore/python/petstore_api/apis/paths/fake_test_query_paramters.py rename samples/openapi3/client/petstore/python/petstore_api/paths/{fake_test_query_paramters => fake_test_query_parameters}/__init__.py (68%) rename samples/openapi3/client/petstore/python/petstore_api/paths/{fake_test_query_paramters => fake_test_query_parameters}/put.py (100%) rename samples/openapi3/client/petstore/python/petstore_api/paths/{fake_test_query_paramters => fake_test_query_parameters}/put.pyi (100%) rename samples/openapi3/client/petstore/python/test/test_paths/{test_fake_test_query_paramters => test_fake_test_query_parameters}/__init__.py (100%) rename samples/openapi3/client/petstore/python/test/test_paths/{test_fake_test_query_paramters => test_fake_test_query_parameters}/test_put.py (77%) diff --git a/.github/workflows/samples-java-client-jdk11.yaml b/.github/workflows/samples-java-client-jdk11.yaml index 48e996cc1815..0e544752b52f 100644 --- a/.github/workflows/samples-java-client-jdk11.yaml +++ b/.github/workflows/samples-java-client-jdk11.yaml @@ -36,7 +36,7 @@ jobs: - samples/client/petstore/java/resttemplate - samples/client/petstore/java/resttemplate-withXml - samples/client/petstore/java/webclient - - samples/client/petstore/java/webclient-nulable-arrays + - samples/client/petstore/java/webclient-nullable-arrays - samples/client/petstore/java/vertx - samples/client/petstore/java/jersey2-java8-localdatetime - samples/client/petstore/java/resteasy diff --git a/.github/workflows/samples-kotlin-client.yaml b/.github/workflows/samples-kotlin-client.yaml index 9eaecf529b9d..653119c41300 100644 --- a/.github/workflows/samples-kotlin-client.yaml +++ b/.github/workflows/samples-kotlin-client.yaml @@ -1,4 +1,4 @@ -name: Samples Kotlin cilent +name: Samples Kotlin client on: push: diff --git a/.gitpod.yml b/.gitpod.yml index 1dd7933eff14..ee1ae6f0f74f 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -12,7 +12,7 @@ ## customise it to your individual needs - from themes to extensions, you ## have full control. ## -## The easiest way to try out Gitpod is install the browser extenion: +## The easiest way to try out Gitpod is install the browser extension: ## 'https://www.gitpod.io/docs/browser-extension' or by prefixing ## 'https://gitpod.io#' to the source control URL of any project. ## diff --git a/bin/configs/aspnetcore-6.0-project4Models.yaml b/bin/configs/aspnetcore-6.0-project4Models.yaml index bb8b63602c51..ae4b1a9c2313 100644 --- a/bin/configs/aspnetcore-6.0-project4Models.yaml +++ b/bin/configs/aspnetcore-6.0-project4Models.yaml @@ -6,4 +6,4 @@ additionalProperties: packageGuid: '{3C799344-F285-4669-8FD5-7ED9B795D5C5}' aspnetCoreVersion: "6.0" userSecretsGuid: 'cb87e868-8646-48ef-9bb6-344b537d0d37' - useSeperateModelProject: true + useSeparateModelProject: true diff --git a/bin/configs/java-camel-petstore-new.yaml b/bin/configs/java-camel-petstore-new.yaml index 9b28eaf1ee7e..7984a5a57aed 100644 --- a/bin/configs/java-camel-petstore-new.yaml +++ b/bin/configs/java-camel-petstore-new.yaml @@ -12,6 +12,6 @@ additionalProperties: library: "spring-boot" withXml: true jackson: true - camelUseDefaultValidationtErrorProcessor: true + camelUseDefaultValidationErrorProcessor: true camelRestClientRequestValidation: true camelSecurityDefinitions: true diff --git a/bin/configs/java-webclient-nullable-array.yaml b/bin/configs/java-webclient-nullable-array.yaml index 24d280bc8cbd..9e94c2271c16 100644 --- a/bin/configs/java-webclient-nullable-array.yaml +++ b/bin/configs/java-webclient-nullable-array.yaml @@ -1,5 +1,5 @@ generatorName: java -outputDir: samples/client/petstore/java/webclient-nulable-arrays +outputDir: samples/client/petstore/java/webclient-nullable-arrays library: webclient inputSpec: modules/openapi-generator/src/test/resources/3_0/schema-with-nullable-arrays.yaml templateDir: modules/openapi-generator/src/main/resources/Java diff --git a/bin/configs/swift5-deprecated.yaml b/bin/configs/swift5-deprecated.yaml index 0b0206731342..c378394e62cf 100644 --- a/bin/configs/swift5-deprecated.yaml +++ b/bin/configs/swift5-deprecated.yaml @@ -1,6 +1,6 @@ generatorName: swift5 outputDir: samples/client/petstore/swift5/deprecated -inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-depreacted-fields.yaml +inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-deprecated-fields.yaml templateDir: modules/openapi-generator/src/main/resources/swift5 generateAliasAsModel: true additionalProperties: diff --git a/bin/utils/test_file_list.yaml b/bin/utils/test_file_list.yaml index 2554a17803ae..e6356812f919 100644 --- a/bin/utils/test_file_list.yaml +++ b/bin/utils/test_file_list.yaml @@ -1,9 +1,9 @@ --- # csharp-netcore test files and image for upload - filename: "samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/JSONComposedSchemaTests.cs" - sha256: aaa596db60531417994533b0e7962eca21dcaf8fa3aea1e2e3cb8b1b216cb89f + sha256: 054adb6efaff70f492e471cb3e4d628d22cda814906808fd3fcce36ce710b7ee - filename: "samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs" - sha256: dae985015ba461297927d544a78267f2def35e07c3f14ca66468fd61e1fd1c26 + sha256: ff6a5fccd4c026d85fe7232911cda445f5065dcefd03abe258e19af5b28d05c5 - filename: "samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/linux-logo.png" sha256: 0a67c32728197e942b13bdda064b73793f12f5c795f1e5cf35a3adf69c973230 # java okhttp gson test files diff --git a/docs/customization.md b/docs/customization.md index 39d45c3834eb..51ef57b6aace 100644 --- a/docs/customization.md +++ b/docs/customization.md @@ -56,7 +56,7 @@ The above configuration will do the following: * Compile a user-provided `my_custom_templates/api_interfaces.mustache` following our usual API template compilation logic. That is, one file will be created per API; APIs are generated defined according to tags in your spec documentation. The destination filename of `Interface.kt` will act as a suffix for the filename. So, a tag of `Equipment` will output a corresponding `EquipmentInterface.kt`. * Because `api.mustache` is the same mustache filename as used in your target generator (`kotlin` in this example), we support the following: - The destination filename provides a suffix for the generated output. APIs generate per tag in your specification. So, a tag of `Equipment` will output a corresponding `EquipmentImpl.kt`. This option will be used whether `api.mustache` targets a user customized template or a built-in template. - - The built-in template will be used if you haven't provided an customized template. The kotlin generator defines the suffix as simply `.kt`, so this scenario would modify only the generated file suffixes according to the previous bullet point. + - The built-in template will be used if you haven't provided a customized template. The kotlin generator defines the suffix as simply `.kt`, so this scenario would modify only the generated file suffixes according to the previous bullet point. - Your `api.mustache` will be used if it exists in your custom template directory. For generators with library options, such as `jvm-okhttp3` in the kotlin generator, your file must exist in the same relative location as the embedded template. For kotlin using the `jvm-okhttp3` library option, this file would need to be located at `my_custom_templates/libraries/jvm-okhttp/api.mustache`. See [templating](./templating.md) for more details. * Compile `my_custom_templates/other/check.mustache` with the supporting files bundle, and output to `scripts/check.sh` in your output directory. Note that we don't currently support setting file flags on output, so scripts such as these will either have to be sourced rather than executed, or have file flags set separately after generation (external to our tooling). @@ -169,7 +169,7 @@ If you publish your artifact to a distant maven repository, do not forget to add You may not want to generate *all* models in your project. Likewise, you may want just one or two apis to be written. If that's the case, you can use system properties or [global properties](./global-properties.md) to control the output. -The default is generate *everything* supported by the specific library. Once you enable a feature, it will restrict the contents generated: +The default is to generate *everything* supported by the specific library. Once you enable a feature, it will restrict the contents generated: ```sh # generate only models @@ -397,7 +397,7 @@ or ## Schema Mapping -One can map the schema to someting else (e.g. external objects/models outside of the package) using the `schemaMappings` option, e.g. in CLI +One can map the schema to something else (e.g. external objects/models outside of the package) using the `schemaMappings` option, e.g. in CLI ```sh java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate -g java -i modules/openapi-generator/src/test/resources/3_0/type-alias.yaml -o /tmp/java2/ --schema-mapping TypeAlias=foo.bar.TypeAlias ``` diff --git a/docs/generators/aspnetcore.md b/docs/generators/aspnetcore.md index b7f2193194fa..ed22b5802755 100644 --- a/docs/generators/aspnetcore.md +++ b/docs/generators/aspnetcore.md @@ -51,7 +51,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |useDefaultRouting|Use default routing for the ASP.NET Core version.| |true| |useFrameworkReference|Use frameworkReference for ASP.NET Core 3.0+ and PackageReference ASP.NET Core 2.2 or earlier.| |false| |useNewtonsoft|Uses the Newtonsoft JSON library.| |true| -|useSeperateModelProject|Create a seperate project for models| |false| +|useSeparateModelProject|Create a separate project for models| |false| |useSwashbuckle|Uses the Swashbuckle.AspNetCore NuGet package for documentation.| |true| ## IMPORT MAPPING diff --git a/docs/generators/java-camel.md b/docs/generators/java-camel.md index 348f689876ba..c3cac83c15e3 100644 --- a/docs/generators/java-camel.md +++ b/docs/generators/java-camel.md @@ -38,7 +38,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |camelRestClientRequestValidation|enable validation of the client request to check whether the Content-Type and Accept headers from the client is supported by the Rest-DSL configuration| |false| |camelRestComponent|name of the Camel component to use as the REST consumer| |servlet| |camelSecurityDefinitions|generate camel security definitions| |true| -|camelUseDefaultValidationtErrorProcessor|generate default validation error processor| |true| +|camelUseDefaultValidationErrorProcessor|generate default validation error processor| |true| |camelValidationErrorProcessor|validation error processor bean name| |validationErrorProcessor| |configPackage|configuration package for generated code| |org.openapitools.configuration| |dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|java8| diff --git a/docs/generators/wsdl-schema.md b/docs/generators/wsdl-schema.md index e4c3b801d8d8..f9df093aa0c8 100644 --- a/docs/generators/wsdl-schema.md +++ b/docs/generators/wsdl-schema.md @@ -30,7 +30,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |soapPath|basepath of the soap services| |null| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true| -|useSpecifiedOperationId|wheather to use autogenerated operationId's (default) or those specified in openapi spec| |null| +|useSpecifiedOperationId|whether to use autogenerated operationId's (default) or those specified in openapi spec| |null| ## IMPORT MAPPING diff --git a/docs/migration-from-swagger-codegen.md b/docs/migration-from-swagger-codegen.md index 85232ebb91b6..6a17674a7f64 100644 --- a/docs/migration-from-swagger-codegen.md +++ b/docs/migration-from-swagger-codegen.md @@ -173,10 +173,10 @@ The metadata folder (to store the `VERSION` file for example) is now called `.op If you use a generator without specifying each parameter, you might see some differences in the generated code. As example the default package name used in the generated code has changed. -You need to have a look at the specific value, depending of your target language, but often `Swagger` îs replaced by `OpenAPITools` and `io.swagger` is replaced by `org.openapitools`. +You need to have a look at the specific value, depending on your target language, but often `Swagger` îs replaced by `OpenAPITools` and `io.swagger` is replaced by `org.openapitools`. Concretely if you did not specify anything when you are generating java code, a file `org/openapitools/api/PetApi.java` might be generated instead of `io/swagger/api/PetApi.java`. -If this is a problem for you, you need to explicitly set the the parameter value in order to match with the `swagger-codgen` default value (`apiPackage` == `io.swagger` in the previous example with the java generator). +If this is a problem for you, you need to explicitly set the parameter value in order to match with the `swagger-codegen` default value (`apiPackage` == `io.swagger` in the previous example with the java generator). ## New fully qualified name for the classes diff --git a/docs/migration-guide.adoc b/docs/migration-guide.adoc index 91c5b074bb1d..591aebe82c91 100644 --- a/docs/migration-guide.adoc +++ b/docs/migration-guide.adoc @@ -49,7 +49,7 @@ Projects relying on generated code might need to be adapted. ==== Validate spec on generation by default The default is to validate the spec during generation. If the spec has errors, -they will appear as errors or warnings to the user. This prevent generation of the project. +they will appear as errors or warnings to the user. This prevents generation of the project. If you want to switch back to the `3.1.x` behavior you can use: diff --git a/docs/new-generator.md b/docs/new-generator.md index ad1f77039d45..c9e2b039e47c 100644 --- a/docs/new-generator.md +++ b/docs/new-generator.md @@ -119,7 +119,7 @@ outputFolder = "generated-code" + File.separator + "common-mark"; This is the default output location. This will be `generated-code/common-mark` on non-Windows machines and `generated-code\common-mark` on Windows. You may change this to any value you'd like, but a user will almost always provide an output directory. -> When joining paths, always use `File.seperator` +> When joining paths, always use `File.separator` ```java modelTemplateFiles.put("model.mustache", ".zz"); diff --git a/docs/online.md b/docs/online.md index 3c86b1acd142..2e8064ff8bde 100644 --- a/docs/online.md +++ b/docs/online.md @@ -125,7 +125,7 @@ curl -H "Content-type: application/json" \ http://localhost:8080/api/gen/clients/python ``` -Instead of using `openAPIUrl` with an URL to the OpenAPI spec, one can include the spec in the JSON payload with `spec`: +Instead of using `openAPIUrl` with a URL to the OpenAPI spec, one can include the spec in the JSON payload with `spec`: ```json { diff --git a/docs/roadmap.adoc b/docs/roadmap.adoc index e6d1a0af6ace..2e08fdf41ec7 100644 --- a/docs/roadmap.adoc +++ b/docs/roadmap.adoc @@ -37,7 +37,7 @@ Short term are focused on improving contributor and user productivity (part of t > Feature set, well-defined API (code and templates), and extensibility improvements. * API -** Typed representation of the model bound to our templates. As it is, everything is treated an an Object, and this can lead to changes in the interface which might be unexpected from the template perspective. +** Typed representation of the model bound to our templates. As it is, everything is treated as an Object, and this can lead to changes in the interface which might be unexpected from the template perspective. * Feature set (potential generators to add; not an exhaustive list) ** Azure functions (node.js, server) ** Finagle HTTP Client (Scala, client) diff --git a/docs/roadmap.md b/docs/roadmap.md index 8dc6e85c3e36..337ec9b915a5 100644 --- a/docs/roadmap.md +++ b/docs/roadmap.md @@ -27,7 +27,7 @@ Short term are focused on improving contributor and user productivity (part of t * Automated release stability * General * OAS3.0 features support: anyOf, oneOf, callbacks, etc -* Consider opt-in telemetry about generators being used, limited to a counter of invocations by generator name). This would allow us to make prioritization decisions based on statistics. +* Consider opt-in telemetry about generators being used, limited to a counter of invocations by generator name. This would allow us to make prioritization decisions based on statistics. * Code clean up * centralize build scripts * organize samples/bin scripts according to new generator names @@ -43,7 +43,7 @@ Short term are focused on improving contributor and user productivity (part of t > Feature set, well-defined API (code and templates), and extensibility improvements. ### API -* Typed representation of the model bound to our templates. As it is, everything is treated an an Object, and this can lead to changes in the interface which might be unexpected from the template perspective. +* Typed representation of the model bound to our templates. As it is, everything is treated as an Object, and this can lead to changes in the interface which might be unexpected from the template perspective. * Feature set (potential generators to add; not an exhaustive list) * Azure functions (node.js, server) * Finagle HTTP Client (Scala, client) diff --git a/docs/templating.md b/docs/templating.md index d1bdd81a738c..0b7fe418312b 100644 --- a/docs/templating.md +++ b/docs/templating.md @@ -845,7 +845,7 @@ The following are vendor extensions supported by OpenAPI Generator. The list may #### Enum -`x-enum-varnames` can be used to have an other enum name for the corresponding value. +`x-enum-varnames` can be used to have another enum name for the corresponding value. This is used to define names of the enum items. `x-enum-descriptions` can be used to provide an individual description for each value. diff --git a/docs/usage.md b/docs/usage.md index d6a976fa30a7..6c612b68c18f 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -629,7 +629,7 @@ supportsES6: true ``` The settings are passed exactly the same as for `config.json`. The most important part is the file extension. Supported values are `yml` or `yaml`. -The name of the file should be `config.yml` or `config.yaml` (in our example it will be `config.yaml`. +The name of the file should be `config.yml` or `config.yaml` (in our example it will be `config.yaml`). ```bash openapi-generator-cli generate -i petstore.yaml -g typescript-fetch -o out \ diff --git a/modules/openapi-generator-maven-plugin/examples/camel.xml b/modules/openapi-generator-maven-plugin/examples/camel.xml index 474383cf9226..6db57a04d322 100644 --- a/modules/openapi-generator-maven-plugin/examples/camel.xml +++ b/modules/openapi-generator-maven-plugin/examples/camel.xml @@ -42,10 +42,10 @@ json.out.disableFeatures=WRITE_DATES_AS_TIMESTAMPS true true - true + true true diff --git a/modules/openapi-generator-maven-plugin/examples/multi-module/sample-schema/src/main/resources/openapi.yaml b/modules/openapi-generator-maven-plugin/examples/multi-module/sample-schema/src/main/resources/openapi.yaml index 0f5b2e5e8d4f..110917ee1ea5 100644 --- a/modules/openapi-generator-maven-plugin/examples/multi-module/sample-schema/src/main/resources/openapi.yaml +++ b/modules/openapi-generator-maven-plugin/examples/multi-module/sample-schema/src/main/resources/openapi.yaml @@ -335,7 +335,7 @@ paths: - "store" summary: "Find purchase order by ID" description: "For valid response try integer IDs with value <= 5 or > 10. Other\ - \ values will generated exceptions" + \ values will generate exceptions" operationId: "getOrderById" produces: - "application/xml" diff --git a/modules/openapi-generator-maven-plugin/examples/swagger.yaml b/modules/openapi-generator-maven-plugin/examples/swagger.yaml index 0f5b2e5e8d4f..110917ee1ea5 100644 --- a/modules/openapi-generator-maven-plugin/examples/swagger.yaml +++ b/modules/openapi-generator-maven-plugin/examples/swagger.yaml @@ -335,7 +335,7 @@ paths: - "store" summary: "Find purchase order by ID" description: "For valid response try integer IDs with value <= 5 or > 10. Other\ - \ values will generated exceptions" + \ values will generate exceptions" operationId: "getOrderById" produces: - "application/xml" diff --git a/modules/openapi-generator-maven-plugin/src/test/resources/default/petstore.yaml b/modules/openapi-generator-maven-plugin/src/test/resources/default/petstore.yaml index b63c595bfbf6..0d046ba209b0 100644 --- a/modules/openapi-generator-maven-plugin/src/test/resources/default/petstore.yaml +++ b/modules/openapi-generator-maven-plugin/src/test/resources/default/petstore.yaml @@ -334,7 +334,7 @@ paths: summary: Find purchase order by ID description: >- For valid response try integer IDs with value <= 5 or > 10. Other values - will generated exceptions + will generate exceptions operationId: getOrderById parameters: - name: orderId diff --git a/modules/openapi-generator-maven-plugin/src/test/resources/petstore-on-classpath.yaml b/modules/openapi-generator-maven-plugin/src/test/resources/petstore-on-classpath.yaml index b63c595bfbf6..0d046ba209b0 100644 --- a/modules/openapi-generator-maven-plugin/src/test/resources/petstore-on-classpath.yaml +++ b/modules/openapi-generator-maven-plugin/src/test/resources/petstore-on-classpath.yaml @@ -334,7 +334,7 @@ paths: summary: Find purchase order by ID description: >- For valid response try integer IDs with value <= 5 or > 10. Other values - will generated exceptions + will generate exceptions operationId: getOrderById parameters: - name: orderId diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index 0159ca2c8dae..63efb10c2d65 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -2761,7 +2761,7 @@ protected String toTestCaseName(String specTestCaseName) { /** * A method that allows generators to pre-process test example payloads - * This can be useful if one needs to change how values like null in string are represnted + * This can be useful if one needs to change how values like null in string are represented * @param data the test data payload * @return the updated test data payload */ diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java index 40ebf90595a5..fb4d0a1e9dc9 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java @@ -340,7 +340,7 @@ private void gatherInlineModels(Schema schema, String modelPrefix) { } else { // allOf is just one or more types only so do not generate the inline allOf model if (m.getAllOf().size() == 1) { - // handle earlier in this function when looping through properites + // handle earlier in this function when looping through properties } else if (m.getAllOf().size() > 1) { LOGGER.warn("allOf schema `{}` containing multiple types (not model) is not supported at the moment.", schema.getName()); } else { @@ -892,7 +892,7 @@ private void copyVendorExtensions(Schema source, Schema target) { * * @param name name of the inline schema * @param schema inilne schema - * @return the actual model name (based on inlineSchemaNameMapping if provied) + * @return the actual model name (based on inlineSchemaNameMapping if provided) */ private String addSchemas(String name, Schema schema) { //check inlineSchemaNameMapping diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java index cdf154aefd88..1620e905da05 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java @@ -476,7 +476,7 @@ public String toModelName(String name) { name = toGenericName(name); - // add prefix and/or suffix only if name does not start wth \ (e.g. \DateTime) + // add prefix and/or suffix only if name does not start with \ (e.g. \DateTime) if (!name.matches("^\\\\.*")) { if (!StringUtils.isEmpty(modelNamePrefix)) { name = modelNamePrefix + "_" + name; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java index 4ee7821aefa9..5da97e687484 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java @@ -44,7 +44,7 @@ public class AspNetCoreServerCodegen extends AbstractCSharpCodegen { public static final String USE_SWASHBUCKLE = "useSwashbuckle"; public static final String MODEL_POCOMODE = "pocoModels"; - public static final String USE_MODEL_SEPERATEPROJECT = "useSeperateModelProject"; + public static final String USE_MODEL_SEPERATEPROJECT = "useSeparateModelProject"; public static final String ASPNET_CORE_VERSION = "aspnetCoreVersion"; public static final String SWASHBUCKLE_VERSION = "swashbuckleVersion"; public static final String CLASS_MODIFIER = "classModifier"; @@ -73,7 +73,7 @@ public class AspNetCoreServerCodegen extends AbstractCSharpCodegen { private boolean useSwashbuckle = true; private boolean pocoModels = false; - private boolean useSeperateModelProject = false; + private boolean useSeparateModelProject = false; protected int serverPort = 8080; protected String serverHost = "0.0.0.0"; protected CliOption swashbuckleVersion = new CliOption(SWASHBUCKLE_VERSION, "Swashbuckle version: 3.0.0 (deprecated), 4.0.0 (deprecated), 5.0.0 (deprecated), 6.4.0"); @@ -247,8 +247,8 @@ public AspNetCoreServerCodegen() { pocoModels); addSwitch(USE_MODEL_SEPERATEPROJECT, - "Create a seperate project for models", - useSeperateModelProject); + "Create a separate project for models", + useSeparateModelProject); addSwitch(IS_LIBRARY, "Is the build a library", @@ -373,7 +373,7 @@ public void processOpts() { setOperationModifier(); setModelClassModifier(); setPocoModels(); - setUseSeperateModelProject(); + setUseSeparateModelProject(); setUseSwashbuckle(); setOperationIsAsync(); @@ -408,7 +408,7 @@ public void processOpts() { supportingFiles.add(new SupportingFile("gitignore", packageFolder, ".gitignore")); supportingFiles.add(new SupportingFile("validateModel.mustache", packageFolder + File.separator + "Attributes", "ValidateModelStateAttribute.cs")); - if (useSeperateModelProject) + if (useSeparateModelProject) { supportingFiles.add(new SupportingFile("typeConverter.mustache", sourceFolder + File.separator + modelPackage + File.separator + "Converters", "CustomEnumConverter.cs")); } else { @@ -419,7 +419,7 @@ public void processOpts() { supportingFiles.add(new SupportingFile("OpenApi" + File.separator + "TypeExtensions.mustache", packageFolder + File.separator + "OpenApi", "TypeExtensions.cs")); } - if (useSeperateModelProject) + if (useSeparateModelProject) { supportingFiles.add(new SupportingFile("ModelsProject.csproj.mustache", sourceFolder + File.separator + modelPackage, modelPackage + ".csproj")); } @@ -465,7 +465,7 @@ public String apiFileFolder() { @Override public String modelFileFolder() { - if (!useSeperateModelProject) + if (!useSeparateModelProject) { return outputFolder + File.separator + sourceFolder + File.separator + packageName + File.separator + "Models"; } else { @@ -696,15 +696,15 @@ private void setPocoModels() { } } - private void setUseSeperateModelProject() { + private void setUseSeparateModelProject() { if (additionalProperties.containsKey(USE_MODEL_SEPERATEPROJECT)) { - useSeperateModelProject = convertPropertyToBooleanAndWriteBack(USE_MODEL_SEPERATEPROJECT); - if (useSeperateModelProject) + useSeparateModelProject = convertPropertyToBooleanAndWriteBack(USE_MODEL_SEPERATEPROJECT); + if (useSeparateModelProject) { - LOGGER.info("Using seperate model project"); + LOGGER.info("Using separate model project"); } } else { - additionalProperties.put(USE_MODEL_SEPERATEPROJECT, useSeperateModelProject); + additionalProperties.put(USE_MODEL_SEPERATEPROJECT, useSeparateModelProject); } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java index 5275022545e3..7f11cbbfdb54 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java @@ -1411,7 +1411,7 @@ public ModelsMap postProcessModels(ModelsMap objs) { * Without this method, property petType in GrandparentAnimal will not make it through ParentPet and into ChildCat */ private void EnsureInheritedPropertiesArePresent(CodegenModel derivedModel) { - // every c# generator should definetly want this, or we should fix the issue + // every c# generator should definitely want this, or we should fix the issue // still, lets avoid breaking changes :( if (Boolean.FALSE.equals(GENERICHOST.equals(getLibrary()))){ return; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartDioClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartDioClientCodegen.java index 711a111be6a8..25e60dc0a311 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartDioClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartDioClientCodegen.java @@ -500,7 +500,7 @@ private void adaptToDartInheritance(Map objs) { // ancestorOnlyProperties are properties defined by all ancestors // NOTE: oneOf,anyOf are NOT considered ancestors - // since a child in dart must implment ALL OF the parent (using implements) + // since a child in dart must implement ALL OF the parent (using implements) Map ancestorOnlyProperties = new HashMap<>(); // combines both selfOnlyProperties and ancestorOnlyProperties diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCamelServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCamelServerCodegen.java index 12c3c633fe1c..314764646060 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCamelServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCamelServerCodegen.java @@ -43,7 +43,7 @@ public class JavaCamelServerCodegen extends SpringCodegen implements BeanValidat public static final String CAMEL_REST_COMPONENT = "camelRestComponent"; public static final String CAMEL_REST_BINDING_MODE = "camelRestBindingMode"; public static final String CAMEL_REST_CLIENT_REQUEST_VALIDATION = "camelRestClientRequestValidation"; - public static final String CAMEL_USE_DEFAULT_VALIDATION_ERROR_PROCESSOR = "camelUseDefaultValidationtErrorProcessor"; + public static final String CAMEL_USE_DEFAULT_VALIDATION_ERROR_PROCESSOR = "camelUseDefaultValidationErrorProcessor"; public static final String CAMEL_VALIDATION_ERROR_PROCESSOR = "camelValidationErrorProcessor"; public static final String CAMEL_SECURITY_DEFINITIONS = "camelSecurityDefinitions"; public static final String CAMEL_DATAFORMAT_PROPERTIES = "camelDataformatProperties"; @@ -51,7 +51,7 @@ public class JavaCamelServerCodegen extends SpringCodegen implements BeanValidat private String camelRestComponent = "servlet"; private String camelRestBindingMode = "auto"; private boolean camelRestClientRequestValidation = false; - private boolean camelUseDefaultValidationtErrorProcessor = true; + private boolean camelUseDefaultValidationErrorProcessor = true; private String camelValidationErrorProcessor = "validationErrorProcessor"; private boolean camelSecurityDefinitions = true; private String camelDataformatProperties = ""; @@ -109,7 +109,7 @@ public void processOpts() { "RestConfiguration.java")); if (performBeanValidation) { apiTemplateFiles.put("validation.mustache", "Validator.java"); - if (camelUseDefaultValidationtErrorProcessor) { + if (camelUseDefaultValidationErrorProcessor) { supportingFiles.add(new SupportingFile("errorProcessor.mustache", (sourceFolder + File.separator + basePackage).replace(".", java.io.File.separator), "ValidationErrorProcessor.java")); @@ -174,7 +174,7 @@ private void addCliOptions() { cliOptions.add(new CliOption(CAMEL_REST_COMPONENT, "name of the Camel component to use as the REST consumer").defaultValue(camelRestComponent)); cliOptions.add(new CliOption(CAMEL_REST_BINDING_MODE, "binding mode to be used by the REST consumer").defaultValue(camelRestBindingMode)); cliOptions.add(CliOption.newBoolean(CAMEL_REST_CLIENT_REQUEST_VALIDATION, "enable validation of the client request to check whether the Content-Type and Accept headers from the client is supported by the Rest-DSL configuration", camelRestClientRequestValidation)); - cliOptions.add(CliOption.newBoolean(CAMEL_USE_DEFAULT_VALIDATION_ERROR_PROCESSOR, "generate default validation error processor", camelUseDefaultValidationtErrorProcessor)); + cliOptions.add(CliOption.newBoolean(CAMEL_USE_DEFAULT_VALIDATION_ERROR_PROCESSOR, "generate default validation error processor", camelUseDefaultValidationErrorProcessor)); cliOptions.add(new CliOption(CAMEL_VALIDATION_ERROR_PROCESSOR, "validation error processor bean name").defaultValue(camelValidationErrorProcessor)); cliOptions.add(CliOption.newBoolean(CAMEL_SECURITY_DEFINITIONS, "generate camel security definitions", camelSecurityDefinitions)); cliOptions.add(new CliOption(CAMEL_DATAFORMAT_PROPERTIES, "list of dataformat properties separated by comma (propertyName1=propertyValue2,...").defaultValue(camelDataformatProperties)); @@ -184,7 +184,7 @@ private void manageAdditionalProperties() { camelRestComponent = manageAdditionalProperty(CAMEL_REST_COMPONENT, camelRestComponent); camelRestBindingMode = manageAdditionalProperty(CAMEL_REST_BINDING_MODE, camelRestBindingMode); camelRestClientRequestValidation = manageAdditionalProperty(CAMEL_REST_CLIENT_REQUEST_VALIDATION, camelRestClientRequestValidation); - camelUseDefaultValidationtErrorProcessor = manageAdditionalProperty(CAMEL_USE_DEFAULT_VALIDATION_ERROR_PROCESSOR, camelUseDefaultValidationtErrorProcessor); + camelUseDefaultValidationErrorProcessor = manageAdditionalProperty(CAMEL_USE_DEFAULT_VALIDATION_ERROR_PROCESSOR, camelUseDefaultValidationErrorProcessor); camelValidationErrorProcessor = manageAdditionalProperty(CAMEL_VALIDATION_ERROR_PROCESSOR, camelValidationErrorProcessor); camelSecurityDefinitions = manageAdditionalProperty(CAMEL_SECURITY_DEFINITIONS, camelSecurityDefinitions); camelDataformatProperties = manageAdditionalProperty(CAMEL_DATAFORMAT_PROPERTIES, camelDataformatProperties); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java index 9e96323d1138..a0aae6cc1794 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java @@ -715,7 +715,7 @@ public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List ops = operations.getOperation(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KtormSchemaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KtormSchemaCodegen.java index 1bf5b024ec06..ebada61f2cbf 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KtormSchemaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KtormSchemaCodegen.java @@ -163,8 +163,8 @@ public KtormSchemaCodegen() { typeMapping.put("short", "kotlin.Short"); typeMapping.put("char", "kotlin.String"); typeMapping.put("real", "kotlin.Double"); - typeMapping.put("UUID", "java.util.UUID"); //be explict - typeMapping.put("URI", "java.net.URI"); //be explict + typeMapping.put("UUID", "java.util.UUID"); //be explicit + typeMapping.put("URI", "java.net.URI"); //be explicit typeMapping.put("decimal", "java.math.BigDecimal"); typeMapping.put("BigDecimal", "java.math.BigDecimal"); typeMapping.put("AnyType", "kotlin.Any"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java index 5100b00017ba..0aeee921a08a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java @@ -204,7 +204,7 @@ public PythonClientCodegen() { .defaultValue("1.0.0")); cliOptions.add(new CliOption(PACKAGE_URL, "python package URL.")); // this generator does not use SORT_PARAMS_BY_REQUIRED_FLAG - // this generator uses the following order for endpoint paramters and model properties + // this generator uses the following order for endpoint parameters and model properties // required params // optional params which are set to unset as their default for method signatures only // optional params as **kwargs @@ -925,7 +925,7 @@ public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List getModelNameToSchemaCache() { /** * Use cases: * additional properties is unset: do nothing - * additional properties is true: add definiton to property - * additional properties is false: add definiton to property - * additional properties is schema: add definiton to property + * additional properties is true: add definition to property + * additional properties is false: add definition to property + * additional properties is schema: add definition to property * * @param schema the schema that may contain an additional property schema * @param property the property for the above schema @@ -2488,7 +2488,7 @@ public ModelsMap postProcessModels(ModelsMap objs) { /** * @param pattern the regex pattern - * @return List> + * @return List> */ private List getPatternAndModifiers(String pattern) { /* diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java index 5401e6821522..24669ea6db17 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java @@ -177,7 +177,7 @@ public RClientCodegen() { typeMapping.put("map", "map"); typeMapping.put("object", "object"); - // no need for import mapping as R doesn't reqiure api,model import + // no need for import mapping as R doesn't require api,model import // https://github.com/OpenAPITools/openapi-generator/issues/2217 importMapping.clear(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaSttpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaSttpClientCodegen.java index dc7aaf221f46..798d64c17164 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaSttpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaSttpClientCodegen.java @@ -309,12 +309,12 @@ private boolean isEnumClass(final String importPath, final Map modles = objs.getModels(); - if (modles == null || modles.isEmpty()) { + List models = objs.getModels(); + if (models == null || models.isEmpty()) { continue; } - for (final Map modle : modles) { - String enumImportPath = (String) modle.get("importPath"); + for (final Map model : models) { + String enumImportPath = (String) model.get("importPath"); if (enumImportPath != null && enumImportPath.equals(importPath)) { return true; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/WsdlSchemaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/WsdlSchemaCodegen.java index 2f66b96468f0..2dc1e6764a00 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/WsdlSchemaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/WsdlSchemaCodegen.java @@ -66,7 +66,7 @@ public WsdlSchemaCodegen() { cliOptions.add(new CliOption("contentTypeVersion", "generate WSDL with parameters/responses of the specified content-type")); cliOptions.add(new CliOption("useSpecifiedOperationId", - "wheather to use autogenerated operationId's (default) " + "whether to use autogenerated operationId's (default) " + "or those specified in openapi spec")); additionalProperties.put("hostname", "localhost"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/OptionalParameterLambda.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/OptionalParameterLambda.java index 3494628043a9..2a152e9dbb78 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/OptionalParameterLambda.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/OptionalParameterLambda.java @@ -28,7 +28,7 @@ import static org.openapitools.codegen.utils.StringUtils.camelize; /** - * Appends trailing ? to a text fragement if not already present + * Appends trailing ? to a text fragment if not already present * * Register: * 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/RequiredParameterLambda.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/RequiredParameterLambda.java
index 54b5fad703b7..e42a373b0428 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/RequiredParameterLambda.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/RequiredParameterLambda.java
@@ -27,7 +27,7 @@
 import static org.openapitools.codegen.utils.StringUtils.camelize;
 
 /**
- * Strips trailing ? from a text fragement
+ * Strips trailing ? from a text fragment
  *
  * Register:
  * 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java
index fbabd3bd5ad1..107045d3958c 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java
@@ -426,7 +426,7 @@ public static boolean isTypeObjectSchema(Schema schema) {
     /**
      * Return true if the specified schema is an object with a fixed number of properties.
      *
-     * A ObjectSchema differs from an MapSchema in the following way:
+     * A ObjectSchema differs from a MapSchema in the following way:
      * - An ObjectSchema is not extensible, i.e. it has a fixed number of properties.
      * - A MapSchema is an object that can be extended with an arbitrary set of properties.
      *   The payload may include dynamic properties.
@@ -917,7 +917,7 @@ public static List getAllSchemas(OpenAPI openAPI) {
     }
 
     /**
-     * If a RequestBody contains a reference to an other RequestBody with '$ref', returns the referenced RequestBody if it is found or the actual RequestBody in the other cases.
+     * If a RequestBody contains a reference to another RequestBody with '$ref', returns the referenced RequestBody if it is found or the actual RequestBody in the other cases.
      *
      * @param openAPI     specification being checked
      * @param requestBody potentially containing a '$ref'
@@ -946,7 +946,7 @@ public static RequestBody getRequestBody(OpenAPI openAPI, String name) {
     }
 
     /**
-     * If a ApiResponse contains a reference to an other ApiResponse with '$ref', returns the referenced ApiResponse if it is found or the actual ApiResponse in the other cases.
+     * If a ApiResponse contains a reference to another ApiResponse with '$ref', returns the referenced ApiResponse if it is found or the actual ApiResponse in the other cases.
      *
      * @param openAPI     specification being checked
      * @param apiResponse potentially containing a '$ref'
@@ -975,7 +975,7 @@ public static ApiResponse getApiResponse(OpenAPI openAPI, String name) {
     }
 
     /**
-     * If a Parameter contains a reference to an other Parameter with '$ref', returns the referenced Parameter if it is found or the actual Parameter in the other cases.
+     * If a Parameter contains a reference to another Parameter with '$ref', returns the referenced Parameter if it is found or the actual Parameter in the other cases.
      *
      * @param openAPI   specification being checked
      * @param parameter potentially containing a '$ref'
@@ -1004,7 +1004,7 @@ public static Parameter getParameter(OpenAPI openAPI, String name) {
     }
 
     /**
-     * If a Callback contains a reference to an other Callback with '$ref', returns the referenced Callback if it is found or the actual Callback in the other cases.
+     * If a Callback contains a reference to another Callback with '$ref', returns the referenced Callback if it is found or the actual Callback in the other cases.
      *
      * @param openAPI  specification being checked
      * @param callback potentially containing a '$ref'
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/RuleConfiguration.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/RuleConfiguration.java
index 56f254cfbac3..1f85dad3c674 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/RuleConfiguration.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/validations/oas/RuleConfiguration.java
@@ -107,7 +107,7 @@ public void setEnableSchemaTypeRecommendation(boolean enableSchemaTypeRecommenda
     }
 
     /**
-     * Gets whether the recommendation check for for schemas containing type definitions.
+     * Gets whether the recommendation check for schemas containing type definitions.
      * 

      * In OpenAPI 3.0.x, the "type" attribute must be a string value.
      * In OpenAPI 3.1, the type attribute may be:
@@ -134,7 +134,7 @@ public void setEnableNullableAttributeRecommendation(boolean enableNullableAttri
     }
 
     /**
-     * Gets whether the recommendation check for for schemas containing the 'nullable' attribute.
+     * Gets whether the recommendation check for schemas containing the 'nullable' attribute.
      * 

      * In OpenAPI 3.0.x, the "nullable" attribute is supported. However, because it is deprecated in 3.1
      * and above, a warning is logged to prepare for OpenAPI 3.1 recommendations.
@@ -160,7 +160,7 @@ public void setEnableInvalidTypeRecommendation(boolean enableInvalidTypeRecommen
     }
 
     /**
-     * Gets whether the recommendation check for for schemas containing invalid values for the 'type' attribute.
+     * Gets whether the recommendation check for schemas containing invalid values for the 'type' attribute.
      * 

      *
      * @return true if enabled, false if disabled
diff --git a/modules/openapi-generator/src/main/resources/C-libcurl/cJSON.c.mustache b/modules/openapi-generator/src/main/resources/C-libcurl/cJSON.c.mustache
index 2139b5efd936..afc9ff0db8b2 100644
--- a/modules/openapi-generator/src/main/resources/C-libcurl/cJSON.c.mustache
+++ b/modules/openapi-generator/src/main/resources/C-libcurl/cJSON.c.mustache
@@ -125,7 +125,7 @@ typedef struct internal_hooks
 } internal_hooks;
 
 #if defined(_MSC_VER)
-/* work around MSVC error C2322: '...' address of dillimport '...' is not static */
+/* work around MSVC error C2322: '...' address of dllimport '...' is not static */
 static void *internal_malloc(size_t size)
 {
     return malloc(size);
diff --git a/modules/openapi-generator/src/main/resources/Eiffel/api_client.mustache b/modules/openapi-generator/src/main/resources/Eiffel/api_client.mustache
index 6bfe00c620d7..b0f9441243c2 100644
--- a/modules/openapi-generator/src/main/resources/Eiffel/api_client.mustache
+++ b/modules/openapi-generator/src/main/resources/Eiffel/api_client.mustache
@@ -320,7 +320,7 @@ feature -- HTTP client: call api
 			-- Execute an HTTP request with the given options.
 			-- Relative path `a_path'
 			-- Method `a_method'  "GET", "HEAD", "OPTIONS", "POST", "PUT", "PATCH" and "DELETE"
-			-- A request `a_request' wth
+			-- A request `a_request' with
 			-- The query parameters: `query_params'.
 			-- The Header parameters: `header_params'.
 			-- The Request Body: `body' could be Void, object to be serialized using the serializer function `a_serializer' with a given content_type.
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/additional_properties.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/additional_properties.mustache
index 4086383f1528..8e7182792457 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/native/additional_properties.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/additional_properties.mustache
@@ -10,7 +10,7 @@
    * Set the additional (undeclared) property with the specified name and value.
    * If the property does not already exist, create it otherwise replace it.
    * @param key the name of the property
-   * @param value the value value of the property
+   * @param value the value of the property
    * @return self reference
    */
   @JsonAnySetter
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache
index 20458364e935..e41ffd9d7339 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache
@@ -579,7 +579,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              {{#isAdditionalPropertiesTrue}}
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/CXF2InterfaceComparator.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/CXF2InterfaceComparator.mustache
index d1fd0bf82c80..c8340c5e9204 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/CXF2InterfaceComparator.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/CXF2InterfaceComparator.mustache
@@ -69,7 +69,7 @@ public class CXFInterfaceComparator implements ResourceComparator {
             if (requestVerb.equals(HttpMethod.OPTIONS) && match(pathValue,requestPath)) {
                return true;
             }
-            // Also check the HTTP verb since a single path can be match do multiple request, depending of the HTTP request verb.
+            // Also check the HTTP verb since a single path can be match do multiple request, depending on the HTTP request verb.
             if (requestVerb.equals(methodHttpVerb) && match(pathValue, requestPath)) {
                return true;
             }
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/CXF2InterfaceComparator.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/CXF2InterfaceComparator.mustache
index d1fd0bf82c80..c8340c5e9204 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/CXF2InterfaceComparator.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/CXF2InterfaceComparator.mustache
@@ -69,7 +69,7 @@ public class CXFInterfaceComparator implements ResourceComparator {
             if (requestVerb.equals(HttpMethod.OPTIONS) && match(pathValue,requestPath)) {
                return true;
             }
-            // Also check the HTTP verb since a single path can be match do multiple request, depending of the HTTP request verb.
+            // Also check the HTTP verb since a single path can be match do multiple request, depending on the HTTP request verb.
             if (requestVerb.equals(methodHttpVerb) && match(pathValue, requestPath)) {
                return true;
             }
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/README.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/README.mustache
index 93c1ccb78114..4718b9d4b902 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/README.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/README.mustache
@@ -9,13 +9,13 @@ This example uses the [JAX-RS](https://jax-rs-spec.java.net/) framework.
 
 {{#interfaceOnly}}
 This project produces a jar that defines some interfaces.
-The jar can be used in combination with an other project providing the implementation.
+The jar can be used in combination with another project providing the implementation.
 {{/interfaceOnly}}
 
 {{^interfaceOnly}}
 The JAX-RS implementation needs to be provided by the application server you are deploying on.
 
-To run the server from the command line, you can use maven to provision an start a TomEE Server.
+To run the server from the command line, you can use maven to provision and start a TomEE Server.
 Please execute the following:
 
 ```
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/helidon/README.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/helidon/README.mustache
index d2d0ddaa1e55..2661c14e4c25 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/helidon/README.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/helidon/README.mustache
@@ -12,7 +12,7 @@ The pom file is configured to use [Helidon](https://helidon.io/) as application
 
 {{#interfaceOnly}}
 This project produces a jar that defines some interfaces.
-The jar can be used in combination with an other project providing the implementation.
+The jar can be used in combination with another project providing the implementation.
 {{/interfaceOnly}}
 
 {{^interfaceOnly}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/kumuluzee/README.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/kumuluzee/README.mustache
index deea381ac94e..d2ad96e1f309 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/kumuluzee/README.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/kumuluzee/README.mustache
@@ -12,7 +12,7 @@ The pom file is configured to use [KumuluzEE](https://ee.kumuluz.com/) as applic
 
 {{#interfaceOnly}}
     This project produces a jar that defines some interfaces.
-    The jar can be used in combination with an other project providing the implementation.
+    The jar can be used in combination with another project providing the implementation.
 {{/interfaceOnly}}
 
 {{^interfaceOnly}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/openliberty/README.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/openliberty/README.mustache
index 21a76d827106..1db634c6f977 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/openliberty/README.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/openliberty/README.mustache
@@ -12,7 +12,7 @@ The pom file is configured to use [Open Liberty](https://openliberty.io/) as app
 
 {{#interfaceOnly}}
 This project produces a jar that defines some interfaces.
-The jar can be used in combination with an other project providing the implementation.
+The jar can be used in combination with another project providing the implementation.
 {{/interfaceOnly}}
 
 {{^interfaceOnly}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/README.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/README.mustache
index 6c5ef2f11dd0..dfcb3d94a56f 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/README.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/README.mustache
@@ -12,7 +12,7 @@ The pom file is configured to use [Quarkus](https://quarkus.io/) as application
 
 {{#interfaceOnly}}
 This project produces a jar that defines some interfaces.
-The jar can be used in combination with an other project providing the implementation.
+The jar can be used in combination with another project providing the implementation.
 {{/interfaceOnly}}
 
 {{^interfaceOnly}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/thorntail/README.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/thorntail/README.mustache
index 66e31f3b0c7a..c4ec90cbdeeb 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/thorntail/README.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/thorntail/README.mustache
@@ -12,7 +12,7 @@ The pom file is configured to use [Thorntail](https://thorntail.io) as applicati
 
 {{#interfaceOnly}}
 This project produces a jar that defines some interfaces.
-The jar can be used in combination with an other project providing the implementation.
+The jar can be used in combination with another project providing the implementation.
 {{/interfaceOnly}}
 
 {{^interfaceOnly}}
diff --git a/modules/openapi-generator/src/main/resources/Javascript-Flowtyped/README.mustache b/modules/openapi-generator/src/main/resources/Javascript-Flowtyped/README.mustache
index e93ab6f53dd0..754e5f7da022 100644
--- a/modules/openapi-generator/src/main/resources/Javascript-Flowtyped/README.mustache
+++ b/modules/openapi-generator/src/main/resources/Javascript-Flowtyped/README.mustache
@@ -15,7 +15,7 @@ Module system
 
 ### Building
 
-To build an compile the flow typed sources to javascript use:
+To build and compile the flow typed sources to javascript use:
 ```
 npm install
 # The dependency `babel-preset-react-app` requires that you specify `NODE_ENV` or `BABEL_ENV` environment variables
diff --git a/modules/openapi-generator/src/main/resources/Javascript/partial_model_oneof.mustache b/modules/openapi-generator/src/main/resources/Javascript/partial_model_oneof.mustache
index b226851ffc3d..a0ff043a1d8a 100644
--- a/modules/openapi-generator/src/main/resources/Javascript/partial_model_oneof.mustache
+++ b/modules/openapi-generator/src/main/resources/Javascript/partial_model_oneof.mustache
@@ -228,7 +228,7 @@ class {{classname}} {
 
     {{#emitJSDoc}}
     /**
-     * Gets the actaul instance, which can be {{#oneOf}}{{{.}}}{{^-last}}, {{/-last}}{{/oneOf}}.
+     * Gets the actual instance, which can be {{#oneOf}}{{{.}}}{{^-last}}, {{/-last}}{{/oneOf}}.
      * @return {{=< >=}}{(<#oneOf>module:<#invokerPackage>/<#modelPackage>/<&.><^-last>|)}<={{ }}=> The actual instance.
      */
     {{/emitJSDoc}}
@@ -238,7 +238,7 @@ class {{classname}} {
 
     {{#emitJSDoc}}
     /**
-     * Sets the actaul instance, which can be {{#oneOf}}{{{.}}}{{^-last}}, {{/-last}}{{/oneOf}}.
+     * Sets the actual instance, which can be {{#oneOf}}{{{.}}}{{^-last}}, {{/-last}}{{/oneOf}}.
      * @param {{=< >=}}{(<#oneOf>module:<#invokerPackage>/<#modelPackage>/<&.><^-last>|)}<={{ }}=> obj The actual instance.
      */
     {{/emitJSDoc}}
@@ -248,7 +248,7 @@ class {{classname}} {
 
     {{#emitJSDoc}}
     /**
-     * Returns the JSON representation of the actual intance.
+     * Returns the JSON representation of the actual instance.
      * @return {string}
      */
     {{/emitJSDoc}}
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Project.csproj.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Project.csproj.mustache
index c663a71f5d70..79ace57649c9 100644
--- a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Project.csproj.mustache
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Project.csproj.mustache
@@ -20,9 +20,9 @@
     ..\..
   
   
-{{#useSeperateModelProject}}
+{{#useSeparateModelProject}}
     
-{{/useSeperateModelProject}}
+{{/useSeparateModelProject}}
 {{#useFrameworkReference}}
 {{#isLibrary}}
     
@@ -31,9 +31,9 @@
 {{^useFrameworkReference}}
     
 {{/useFrameworkReference}}
-{{^useSeperateModelProject}}
+{{^useSeparateModelProject}}
     
-{{/useSeperateModelProject}}
+{{/useSeparateModelProject}}
 {{#useSwashbuckle}}
     
 {{#useNewtonsoft}}
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Solution.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Solution.mustache
index b72da20f3dcd..1b80ca509f1a 100644
--- a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Solution.mustache
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Solution.mustache
@@ -5,10 +5,10 @@ VisualStudioVersion = 15.0.27428.2043
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "{{packageName}}", "{{sourceFolder}}\{{packageName}}\{{packageName}}.csproj", "{{packageGuid}}"
 EndProject
-{{#useSeperateModelProject}}
+{{#useSeparateModelProject}}
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "{{modelPackage}}", "{{sourceFolder}}\{{modelPackage}}\{{modelPackage}}.csproj", "{B8D18F25-F379-4B87-ACCC-F8A17E0AED38}"
 EndProject
-{{/useSeperateModelProject}}
+{{/useSeparateModelProject}}
 Global
     GlobalSection(SolutionConfigurationPlatforms) = preSolution
         Debug|Any CPU = Debug|Any CPU
@@ -19,12 +19,12 @@ Global
         {{packageGuid}}.Debug|Any CPU.Build.0 = Debug|Any CPU
         {{packageGuid}}.Release|Any CPU.ActiveCfg = Release|Any CPU
         {{packageGuid}}.Release|Any CPU.Build.0 = Release|Any CPU
-{{#useSeperateModelProject}}
+{{#useSeparateModelProject}}
         {B8D18F25-F379-4B87-ACCC-F8A17E0AED38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
         {B8D18F25-F379-4B87-ACCC-F8A17E0AED38}.Debug|Any CPU.Build.0 = Debug|Any CPU
         {B8D18F25-F379-4B87-ACCC-F8A17E0AED38}.Release|Any CPU.ActiveCfg = Release|Any CPU
         {B8D18F25-F379-4B87-ACCC-F8A17E0AED38}.Release|Any CPU.Build.0 = Release|Any CPU
-{{/useSeperateModelProject}}
+{{/useSeparateModelProject}}
     EndGlobalSection
     GlobalSection(SolutionProperties) = preSolution
         HideSolutionNode = FALSE
diff --git a/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-validation-body.mustache b/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-validation-body.mustache
index ef92f2c3fbd4..99dae60bbe45 100644
--- a/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-validation-body.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-validation-body.mustache
@@ -116,7 +116,7 @@ TODO validate regex of string using pattern variable. This has two challenges
             { {{! and I do a similar hack with currentValuePath... }}
                 const std::string currentValuePath = oldValuePath + "[" + std::to_string(i) + "]";
                 {{#items}}
-                {{> model-validation-body }} {{! Recursively apply template to array - this is where things will probbaly go wrong }}
+                {{> model-validation-body }} {{! Recursively apply template to array - this is where things will probably go wrong }}
                 {{/items}}
                 i++;
             }
diff --git a/modules/openapi-generator/src/main/resources/cpp-tizen-client/Doxyfile.mustache b/modules/openapi-generator/src/main/resources/cpp-tizen-client/Doxyfile.mustache
index e4fc0125bf00..230d7431dc4c 100644
--- a/modules/openapi-generator/src/main/resources/cpp-tizen-client/Doxyfile.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-tizen-client/Doxyfile.mustache
@@ -294,7 +294,7 @@ MARKDOWN_SUPPORT       = YES
 
 # When enabled doxygen tries to link words that correspond to documented
 # classes, or namespaces to their corresponding documentation. Such a link can
-# be prevented in individual cases by by putting a % sign in front of the word
+# be prevented in individual cases by putting a % sign in front of the word
 # or globally by setting AUTOLINK_SUPPORT to NO.
 # The default value is: YES.
 
@@ -1397,7 +1397,7 @@ EXT_LINKS_IN_WINDOW    = NO
 
 FORMULA_FONTSIZE       = 10
 
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# Use the FORMULA_TRANSPARENT tag to determine whether or not the images
 # generated for formulas are transparent PNGs. Transparent PNGs are not
 # supported properly for IE 6.0, but are supported on all modern browsers.
 #
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/ApiClient.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore-functions/ApiClient.mustache
index 72cbbf86b7eb..7e54ed98b644 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore-functions/ApiClient.mustache
@@ -155,7 +155,7 @@ namespace {{packageName}}.Client
     }
     {{! NOTE: Any changes related to RestSharp should be done in this class. All other client classes are for extensibility by consumers.}}
     /// 

-    /// Provides a default implementation of an Api client (both synchronous and asynchronous implementatios),
+    /// Provides a default implementation of an Api client (both synchronous and asynchronous implementations),
     /// encapsulating general REST accessor use cases.
     /// 
     {{>visibility}} partial class ApiClient : ISynchronousClient{{#supportsAsync}}, IAsynchronousClient{{/supportsAsync}}
@@ -164,7 +164,7 @@ namespace {{packageName}}.Client
 
         /// 
         /// Specifies the settings on a  object.
-        /// These settings can be adjusted to accomodate custom serialization rules.
+        /// These settings can be adjusted to accommodate custom serialization rules.
         /// 
         public JsonSerializerSettings SerializerSettings { get; set; } = new JsonSerializerSettings
         {
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/ClientUtils.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore-functions/ClientUtils.mustache
index 3c04dcdbd0c1..776be1b052ff 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/ClientUtils.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore-functions/ClientUtils.mustache
@@ -25,7 +25,7 @@ namespace {{packageName}}.Client
         public static CompareLogic compareLogic;
 
         /// 
-        /// Static contstructor to initialise compareLogic.
+        /// Static constructor to initialise compareLogic.
         /// 
         static ClientUtils()
         {
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/Configuration.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore-functions/Configuration.mustache
index c71c4260866a..91cd1c86eb65 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/Configuration.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore-functions/Configuration.mustache
@@ -72,7 +72,7 @@ namespace {{packageName}}.Client
 
         /// 
         /// Gets or sets the API key based on the authentication name.
-        /// This is the key and value comprising the "secret" for acessing an API.
+        /// This is the key and value comprising the "secret" for accessing an API.
         /// 
         /// The API key.
         private IDictionary _apiKey;
@@ -469,7 +469,7 @@ namespace {{packageName}}.Client
                 }
                 else
                 {
-                    // use defualt value
+                    // use default value
                     url = url.Replace("{" + variable.Key + "}", (string)serverVariables["default_value"]);
                 }
             }
@@ -480,7 +480,7 @@ namespace {{packageName}}.Client
         {{#hasHttpSignatureMethods}}
 
         /// 
-        /// Gets and Sets the HttpSigningConfiuration
+        /// Gets and Sets the HttpSigningConfiguration
         /// 
         public HttpSigningConfiguration HttpSigningConfiguration
         {
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/HttpSigningConfiguration.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore-functions/HttpSigningConfiguration.mustache
index cc8c275e40bf..f5cc312c6fe5 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/HttpSigningConfiguration.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore-functions/HttpSigningConfiguration.mustache
@@ -18,7 +18,7 @@ namespace {{packageName}}.Client
     {
         #region
         /// 
-        /// Initailize the HashAlgorithm and SigningAlgorithm to default value
+        /// Initialize the HashAlgorithm and SigningAlgorithm to default value
         /// 
         public HttpSigningConfiguration()
         {
@@ -238,7 +238,7 @@ namespace {{packageName}}.Client
                 headerValuesList.Add(string.Format("{0}: {1}", keyVal.Key, keyVal.Value));
 
             }
-            //Concatinate headers value separated by new line
+            //Concatenate headers value separated by new line
             var headerValuesString = string.Join("\n", headerValuesList);
             var signatureStringHash = GetStringHash(HashAlgorithm.ToString(), headerValuesString);
             string headerSignatureStr = null;
@@ -361,7 +361,7 @@ namespace {{packageName}}.Client
         private  byte[] ConvertToECDSAANS1Format(byte[] signedBytes)
         {
             var derBytes = new List();
-            byte derLength = 68; //default lenght for ECDSA code signinged bit 0x44
+            byte derLength = 68; //default length for ECDSA code signing bit 0x44
             byte rbytesLength = 32; //R length 0x20
             byte sbytesLength = 32; //S length 0x20
             var rBytes = new List();
@@ -399,7 +399,7 @@ namespace {{packageName}}.Client
             }
 
             derBytes.Add(48);  //start of the sequence 0x30
-            derBytes.Add(derLength);  //total length r lenth, type and r bytes
+            derBytes.Add(derLength);  //total length r length, type and r bytes
 
             derBytes.Add(2); //tag for integer
             derBytes.Add(rbytesLength); //length of r
@@ -411,7 +411,7 @@ namespace {{packageName}}.Client
             return derBytes.ToArray();
         }
 
-        private  RSACryptoServiceProvider GetRSAProviderFromPemFile(string pemfile, SecureString keyPassPharse = null)
+        private  RSACryptoServiceProvider GetRSAProviderFromPemFile(string pemfile, SecureString keyPassPhrase = null)
         {
             const string pempubheader = "-----BEGIN PUBLIC KEY-----";
             const string pempubfooter = "-----END PUBLIC KEY-----";
@@ -431,7 +431,7 @@ namespace {{packageName}}.Client
 
             if (isPrivateKeyFile)
             {
-                pemkey = ConvertPrivateKeyToBytes(pemstr, keyPassPharse);
+                pemkey = ConvertPrivateKeyToBytes(pemstr, keyPassPhrase);
                 if (pemkey == null)
                 {
                     return null;
@@ -441,7 +441,7 @@ namespace {{packageName}}.Client
             return null;
         }
 
-        private byte[] ConvertPrivateKeyToBytes(string instr, SecureString keyPassPharse = null)
+        private byte[] ConvertPrivateKeyToBytes(string instr, SecureString keyPassPhrase = null)
         {
             const string pemprivheader = "-----BEGIN RSA PRIVATE KEY-----";
             const string pemprivfooter = "-----END RSA PRIVATE KEY-----";
@@ -494,11 +494,11 @@ namespace {{packageName}}.Client
                     binkey = Convert.FromBase64String(encryptedstr);
                 }
                 catch (System.FormatException)
-                {   //data is not in base64 fromat
+                {   //data is not in base64 format
                     return null;
                 }
 
-                byte[] deskey = GetEncryptedKey(salt, keyPassPharse, 1, 2);    // count=1 (for OpenSSL implementation); 2 iterations to get at least 24 bytes
+                byte[] deskey = GetEncryptedKey(salt, keyPassPhrase, 1, 2);    // count=1 (for OpenSSL implementation); 2 iterations to get at least 24 bytes
                 if (deskey == null)
                 {
                     return null;
@@ -638,19 +638,19 @@ namespace {{packageName}}.Client
         {
             IntPtr unmanagedPswd = IntPtr.Zero;
             int HASHLENGTH = 16;    //MD5 bytes
-            byte[] keymaterial = new byte[HASHLENGTH * miter];     //to store contatenated Mi hashed results
+            byte[] keymaterial = new byte[HASHLENGTH * miter];     //to store concatenated Mi hashed results
 
             byte[] psbytes = new byte[secpswd.Length];
             unmanagedPswd = Marshal.SecureStringToGlobalAllocAnsi(secpswd);
             Marshal.Copy(unmanagedPswd, psbytes, 0, psbytes.Length);
             Marshal.ZeroFreeGlobalAllocAnsi(unmanagedPswd);
 
-            // --- contatenate salt and pswd bytes into fixed data array ---
+            // --- concatenate salt and pswd bytes into fixed data array ---
             byte[] data00 = new byte[psbytes.Length + salt.Length];
             Array.Copy(psbytes, data00, psbytes.Length);      //copy the pswd bytes
             Array.Copy(salt, 0, data00, psbytes.Length, salt.Length); //concatenate the salt bytes
 
-            // ---- do multi-hashing and contatenate results  D1, D2 ...  into keymaterial bytes ----
+            // ---- do multi-hashing and concatenate results  D1, D2 ...  into keymaterial bytes ----
             MD5 md5 = new MD5CryptoServiceProvider();
             byte[] result = null;
             byte[] hashtarget = new byte[HASHLENGTH + data00.Length];   //fixed length initial hashtarget
@@ -671,7 +671,7 @@ namespace {{packageName}}.Client
 
                 for (int i = 0; i < count; i++)
                     result = md5.ComputeHash(result);
-                Array.Copy(result, 0, keymaterial, j * HASHLENGTH, result.Length);  //contatenate to keymaterial
+                Array.Copy(result, 0, keymaterial, j * HASHLENGTH, result.Length);  //concatenate to keymaterial
             }
             byte[] deskey = new byte[24];
             Array.Copy(keymaterial, deskey, deskey.Length);
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/IReadableConfiguration.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore-functions/IReadableConfiguration.mustache
index 7c6487d92f84..bf142ffbac1e 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/IReadableConfiguration.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore-functions/IReadableConfiguration.mustache
@@ -39,7 +39,7 @@ namespace {{packageName}}.Client
         /// 
         /// Gets the date time format.
         /// 
-        /// Date time foramt.
+        /// Date time format.
         string DateTimeFormat { get; }
 
         /// 
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/RequestOptions.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore-functions/RequestOptions.mustache
index dc924c733c1a..0d3339f2f39e 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/RequestOptions.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore-functions/RequestOptions.mustache
@@ -25,7 +25,7 @@ namespace {{packageName}}.Client
         public Multimap QueryParameters { get; set; }
 
         /// 
-        /// Header parameters to be applied to to the request.
+        /// Header parameters to be applied to the request.
         /// Keys may have 1 or more values associated.
         /// 
         public Multimap HeaderParameters { get; set; }
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/git_push.sh.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore-functions/git_push.sh.mustache
index 8b3f689c9121..228d338ebdbf 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/git_push.sh.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore-functions/git_push.sh.mustache
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update" "gitlab.com"
 
 git_user_id=$1
 git_repo_id=$2
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/libraries/httpclient/ApiClient.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore-functions/libraries/httpclient/ApiClient.mustache
index f6e850c8657e..2582692cc20d 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/libraries/httpclient/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore-functions/libraries/httpclient/ApiClient.mustache
@@ -159,7 +159,7 @@ namespace {{packageName}}.Client
         }
     }
     /// 
-    /// Provides a default implementation of an Api client (both synchronous and asynchronous implementatios),
+    /// Provides a default implementation of an Api client (both synchronous and asynchronous implementations),
     /// encapsulating general REST accessor use cases.
     /// 
     /// 
@@ -175,7 +175,7 @@ namespace {{packageName}}.Client
 
         /// 
         /// Specifies the settings on a  object.
-        /// These settings can be adjusted to accomodate custom serialization rules.
+        /// These settings can be adjusted to accommodate custom serialization rules.
         /// 
         public JsonSerializerSettings SerializerSettings { get; set; } = new JsonSerializerSettings
         {
@@ -192,8 +192,8 @@ namespace {{packageName}}.Client
 
         /// 
         /// Initializes a new instance of the , defaulting to the global configurations' base url.
-        /// **IMPORTANT** This will also create an istance of HttpClient, which is less than ideal.
-        /// It's better to reuse the HttpClient and HttpClientHander.
+        /// **IMPORTANT** This will also create an instance of HttpClient, which is less than ideal.
+        /// It's better to reuse the HttpClient and HttpClientHandler.
         /// 
         public ApiClient() :
                  this({{packageName}}.Client.GlobalConfiguration.Instance.BasePath)
@@ -202,8 +202,8 @@ namespace {{packageName}}.Client
         
         /// 
         /// Initializes a new instance of the .
-        /// **IMPORTANT** This will also create an istance of HttpClient, which is less than ideal.
-        /// It's better to reuse the HttpClient and HttpClientHander.
+        /// **IMPORTANT** This will also create an instance of HttpClient, which is less than ideal.
+        /// It's better to reuse the HttpClient and HttpClientHandler.
         /// 
         /// The target service's base path in URL format.
         /// 
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/libraries/httpclient/RequestOptions.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore-functions/libraries/httpclient/RequestOptions.mustache
index bc5a8e348b8f..c656d8994523 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/libraries/httpclient/RequestOptions.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore-functions/libraries/httpclient/RequestOptions.mustache
@@ -25,7 +25,7 @@ namespace {{packageName}}.Client
         public Multimap QueryParameters { get; set; }
 
         /// 
-        /// Header parameters to be applied to to the request.
+        /// Header parameters to be applied to the request.
         /// Keys may have 1 or more values associated.
         /// 
         public Multimap HeaderParameters { get; set; }
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/libraries/httpclient/api.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore-functions/libraries/httpclient/api.mustache
index 20ddfe96b989..f0a1aa6497d9 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/libraries/httpclient/api.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore-functions/libraries/httpclient/api.mustache
@@ -106,8 +106,8 @@ namespace {{packageName}}.{{apiPackage}}
 
         /// 
         /// Initializes a new instance of the  class.
-        /// **IMPORTANT** This will also create an istance of HttpClient, which is less than ideal.
-        /// It's better to reuse the HttpClient and HttpClientHander.
+        /// **IMPORTANT** This will also create an instance of HttpClient, which is less than ideal.
+        /// It's better to reuse the HttpClient and HttpClientHandler.
         /// 
         /// 
         public {{classname}}() : this((string)null)
@@ -116,8 +116,8 @@ namespace {{packageName}}.{{apiPackage}}
 
         /// 
         /// Initializes a new instance of the  class.
-        /// **IMPORTANT** This will also create an istance of HttpClient, which is less than ideal.
-        /// It's better to reuse the HttpClient and HttpClientHander.
+        /// **IMPORTANT** This will also create an instance of HttpClient, which is less than ideal.
+        /// It's better to reuse the HttpClient and HttpClientHandler.
         /// 
         /// The target service's base path in URL format.
         /// 
@@ -138,8 +138,8 @@ namespace {{packageName}}.{{apiPackage}}
 
         /// 
         /// Initializes a new instance of the  class using Configuration object.
-        /// **IMPORTANT** This will also create an istance of HttpClient, which is less than ideal.
-        /// It's better to reuse the HttpClient and HttpClientHander.
+        /// **IMPORTANT** This will also create an instance of HttpClient, which is less than ideal.
+        /// It's better to reuse the HttpClient and HttpClientHandler.
         /// 
         /// An instance of Configuration.
         /// 
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/libraries/httpclient/model.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore-functions/libraries/httpclient/model.mustache
index 0de1e05e5140..bdd076c3f018 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/libraries/httpclient/model.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore-functions/libraries/httpclient/model.mustache
@@ -34,11 +34,11 @@ using OpenAPIClientUtils = {{packageName}}.Client.ClientUtils;
 using System.Reflection;
 {{/-first}}
 {{/oneOf}}
-{{#aneOf}}
+{{#anyOf}}
 {{#-first}}
 using System.Reflection;
 {{/-first}}
-{{/aneOf}}
+{{/anyOf}}
 
 namespace {{packageName}}.{{modelPackage}}
 {
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/modelAnyOf.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore-functions/modelAnyOf.mustache
index 931f7646da8a..fbd9fe0441d2 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/modelAnyOf.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore-functions/modelAnyOf.mustache
@@ -59,7 +59,7 @@
         {{#anyOf}}
 
         /// 
-        /// Get the actual instance of `{{{.}}}`. If the actual instanct is not `{{{.}}}`,
+        /// Get the actual instance of `{{{.}}}`. If the actual instance is not `{{{.}}}`,
         /// the InvalidClassException will be thrown
         /// 
         /// An instance of {{{.}}}
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/modelOneOf.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore-functions/modelOneOf.mustache
index d2d6e28b3f91..b3a5503cba4c 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/modelOneOf.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore-functions/modelOneOf.mustache
@@ -59,7 +59,7 @@
         {{#oneOf}}
 
         /// 
-        /// Get the actual instance of `{{{.}}}`. If the actual instanct is not `{{{.}}}`,
+        /// Get the actual instance of `{{{.}}}`. If the actual instance is not `{{{.}}}`,
         /// the InvalidClassException will be thrown
         /// 
         /// An instance of {{{.}}}
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/nuspec.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore-functions/nuspec.mustache
index 66254acffd40..b5740c962e5d 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/nuspec.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore-functions/nuspec.mustache
@@ -12,7 +12,7 @@
         $author$
 
         
+             users to easily find other packages by the same owners.  -->
         $author$
         false
         false
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/RequestOptions.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/RequestOptions.mustache
index 40436b965771..928c5e740739 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/RequestOptions.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/RequestOptions.mustache
@@ -25,7 +25,7 @@ namespace {{packageName}}.Client
         public Multimap QueryParameters { get; set; }
 
         /// 
-        /// Header parameters to be applied to to the request.
+        /// Header parameters to be applied to the request.
         /// Keys may have 1 or more values associated.
         /// 
         public Multimap HeaderParameters { get; set; }
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ApiException.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ApiException.mustache
index 7777fd09c44a..c716cf25e999 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ApiException.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ApiException.mustache
@@ -29,7 +29,7 @@ namespace {{packageName}}.Client
         public string RawContent { get; }
         
         /// 
-        /// Construct the ApiException from parts of the reponse
+        /// Construct the ApiException from parts of the response
         /// 
         /// 
         /// 
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ApiResponse`1.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ApiResponse`1.mustache
index 1bcf4a841483..f37833790ed0 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ApiResponse`1.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ApiResponse`1.mustache
@@ -82,7 +82,7 @@ namespace {{packageName}}.Client
         #endregion Properties
 
         /// 
-        /// Construct the reponse using an HttpResponseMessage
+        /// Construct the response using an HttpResponseMessage
         /// 
         /// 
         /// 
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/HttpSigningConfiguration.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/HttpSigningConfiguration.mustache
index 29ea235945d2..4e17cf240ef4 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/HttpSigningConfiguration.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/HttpSigningConfiguration.mustache
@@ -190,7 +190,7 @@ namespace {{packageName}}.Client
             foreach (var keyVal in httpSignatureHeader)
                 headerValuesList.Add(string.Format("{0}: {1}", keyVal.Key, keyVal.Value));
 
-            //Concatinate headers value separated by new line
+            //Concatenate headers value separated by new line
             var headerValuesString = string.Join("\n", headerValuesList);
             var signatureStringHash = GetStringHash(HashAlgorithm.ToString(), headerValuesString);
             string{{nrt?}} headerSignatureStr = null;
@@ -318,7 +318,7 @@ namespace {{packageName}}.Client
         private  byte[] ConvertToECDSAANS1Format(byte[] signedBytes)
         {
             var derBytes = new List();
-            byte derLength = 68; //default lenght for ECDSA code signinged bit 0x44
+            byte derLength = 68; //default length for ECDSA code signing bit 0x44
             byte rbytesLength = 32; //R length 0x20
             byte sbytesLength = 32; //S length 0x20
             var rBytes = new List();
@@ -353,7 +353,7 @@ namespace {{packageName}}.Client
             }
 
             derBytes.Add(48);  //start of the sequence 0x30
-            derBytes.Add(derLength);  //total length r lenth, type and r bytes
+            derBytes.Add(derLength);  //total length r length, type and r bytes
 
             derBytes.Add(2); //tag for integer
             derBytes.Add(rbytesLength); //length of r
@@ -365,7 +365,7 @@ namespace {{packageName}}.Client
             return derBytes.ToArray();
         }
 
-        private  RSACryptoServiceProvider{{nrt?}} GetRSAProviderFromPemFile(String pemfile, SecureString{{nrt?}} keyPassPharse = null)
+        private  RSACryptoServiceProvider{{nrt?}} GetRSAProviderFromPemFile(String pemfile, SecureString{{nrt?}} keyPassPhrase = null)
         {
             const String pempubheader = "-----BEGIN PUBLIC KEY-----";
             const String pempubfooter = "-----END PUBLIC KEY-----";
@@ -382,7 +382,7 @@ namespace {{packageName}}.Client
 
             if (isPrivateKeyFile)
             {
-                pemkey = ConvertPrivateKeyToBytes(pemstr, keyPassPharse);
+                pemkey = ConvertPrivateKeyToBytes(pemstr, keyPassPhrase);
 
                 if (pemkey == null)
                     return null;
@@ -392,7 +392,7 @@ namespace {{packageName}}.Client
             return null;
         }
 
-        private byte[]{{nrt?}} ConvertPrivateKeyToBytes(String instr, SecureString{{nrt?}} keyPassPharse = null)
+        private byte[]{{nrt?}} ConvertPrivateKeyToBytes(String instr, SecureString{{nrt?}} keyPassPhrase = null)
         {
             const String pemprivheader = "-----BEGIN RSA PRIVATE KEY-----";
             const String pemprivfooter = "-----END RSA PRIVATE KEY-----";
@@ -440,12 +440,12 @@ namespace {{packageName}}.Client
                     binkey = Convert.FromBase64String(encryptedstr);
                 }
                 catch (System.FormatException)
-                {   //data is not in base64 fromat
+                {   //data is not in base64 format
                     return null;
                 }
 
-                // TODO: what do we do here if keyPassPharse is null?
-                byte[] deskey = GetEncryptedKey(salt, keyPassPharse{{nrt!}}, 1, 2);    // count=1 (for OpenSSL implementation); 2 iterations to get at least 24 bytes
+                // TODO: what do we do here if keyPassPhrase is null?
+                byte[] deskey = GetEncryptedKey(salt, keyPassPhrase{{nrt!}}, 1, 2);    // count=1 (for OpenSSL implementation); 2 iterations to get at least 24 bytes
                 if (deskey == null)
                     return null;
 
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/README.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/README.mustache
index 28ace9bfd342..e76936568a71 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/README.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/README.mustache
@@ -170,7 +170,7 @@ Class | Method | HTTP request | Description
 - modelTests: {{generateModelTests}}
 - withXml: {{withXml}}
 
-## [OpenApi Generator Parameteres](https://openapi-generator.tech/docs/generators/csharp-netcore)
+## [OpenApi Generator Parameters](https://openapi-generator.tech/docs/generators/csharp-netcore)
 - allowUnicodeIdentifiers: {{allowUnicodeIdentifiers}}
 - apiName: {{apiName}}
 - caseInsensitiveResponseHeaders: {{caseInsensitiveResponseHeaders}}
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/api.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/api.mustache
index 5e2bb67c23b8..439b19cad357 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/api.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/api.mustache
@@ -377,7 +377,7 @@ namespace {{packageName}}.{{apiPackage}}
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -395,7 +395,7 @@ namespace {{packageName}}.{{apiPackage}}
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }{{^-last}}
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/git_push.ps1.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/git_push.ps1.mustache
index 0f4084ef8179..f263c2bc5977 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/git_push.ps1.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/git_push.ps1.mustache
@@ -49,7 +49,7 @@ Set-StrictMode -Version 3.0
 if ($Help){
     Write-Output "
     This script will initialize a git repository, then add and commit all files.
-    The local repository will then be pushed to your prefered git provider.
+    The local repository will then be pushed to your preferred git provider.
     If the remote repository does not exist yet and you are using GitHub,
     the repository will be created for you provided you have the GitHub CLI installed.
     
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/RequestOptions.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/RequestOptions.mustache
index 62859649ced3..25e76d03d21e 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/RequestOptions.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/RequestOptions.mustache
@@ -25,7 +25,7 @@ namespace {{packageName}}.Client
         public Multimap QueryParameters { get; set; }
 
         /// 
-        /// Header parameters to be applied to to the request.
+        /// Header parameters to be applied to the request.
         /// Keys may have 1 or more values associated.
         /// 
         public Multimap HeaderParameters { get; set; }
diff --git a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/class_serializer.mustache b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/class_serializer.mustache
index d3b3d8916ca6..a0528cd14916 100644
--- a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/class_serializer.mustache
+++ b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/class_serializer.mustache
@@ -262,7 +262,7 @@ class _${{classname}}Serializer implements PrimitiveSerializer<{{classname}}> {
         parent classes don't have builder
         so they must delegate to another serializer using
         1) discriminator + mapping
-        2) concrete implmentation ($classname)
+        2) concrete implementation ($classname)
     }}
     {{#hasDiscriminatorWithNonEmptyMapping}}
     {{#discriminator}}
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-volley/README.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-volley/README.mustache
index ea684b998481..b007ccc48140 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-volley/README.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-volley/README.mustache
@@ -70,8 +70,8 @@ val requestQueue: Lazy = lazy(initializer = {
 The above constructor for each api allows the following to be customized
 - A custom context, so either a singleton request queue or different scope can be created - see
 https://developer.android.com/training/volley/requestqueue#singleton
-- An overrideable request queue - which in turn can have a custom http url stack passed to it
-- An overrideable request factory constructor call, or a request factory that can be overridden by a custom template, with
+- An overridable request queue - which in turn can have a custom http url stack passed to it
+- An overridable request factory constructor call, or a request factory that can be overridden by a custom template, with
 custom header factory, request post processors and custom gson adapters injected.
 
 #### Overriding request generation
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-volley/auth/oauth.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-volley/auth/oauth.mustache
index 78ffc6a2d7c5..81a285bc4782 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-volley/auth/oauth.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-volley/auth/oauth.mustache
@@ -1,5 +1,5 @@
 val basicAuthHeaderFactoryBuilder = { username: String?, password: String? ->
 {
-    throw NotImplementedError("OAuth security scheme header factory not impemented yet - see open api generator auth/oauth.mustache")
+    throw NotImplementedError("OAuth security scheme header factory not implemented yet - see open api generator auth/oauth.mustache")
     mapOf("" to "")}
 }
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-volley/request/RequestFactory.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-volley/request/RequestFactory.mustache
index e9bc5d21283a..46507bff1b5d 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-volley/request/RequestFactory.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-volley/request/RequestFactory.mustache
@@ -40,7 +40,7 @@ class RequestFactory(private val headerFactories : List<() -> Map (acc + factory.invoke()).toMutableMap() }
 
             // If we decide to support auth parameters in the url, then you will reference them by supplying a url string
-            // with known variable name refernces in the string. We will then apply
+            // with known variable name references in the string. We will then apply
             val updatedUrl = if (!queryParams.isNullOrEmpty()) {
                 queryParams.asSequence().fold("$url?") {acc, param ->
                 "$acc${escapeString(param.key)}=${escapeString(param.value)}&"
diff --git a/modules/openapi-generator/src/main/resources/nodejs-express-server/utils/openapiRouter.mustache b/modules/openapi-generator/src/main/resources/nodejs-express-server/utils/openapiRouter.mustache
index a0651549de3f..4c7bbdca7f3c 100644
--- a/modules/openapi-generator/src/main/resources/nodejs-express-server/utils/openapiRouter.mustache
+++ b/modules/openapi-generator/src/main/resources/nodejs-express-server/utils/openapiRouter.mustache
@@ -19,7 +19,7 @@ function handleError(err, request, response, next) {
  * middleware. All parameters are collected in the request.swagger.values key-value object
  *
  * The assumption is that security handlers have already verified and allowed access
- * to this path. If the business-logic of a particular path is dependant on authentication
+ * to this path. If the business-logic of a particular path is dependent on authentication
  * parameters (e.g. scope checking) - it is recommended to define the authentication header
  * as one of the parameters expected in the OpenAPI/Swagger document.
  *
diff --git a/modules/openapi-generator/src/main/resources/php-slim-server/index.mustache b/modules/openapi-generator/src/main/resources/php-slim-server/index.mustache
index 322fc8883d3a..5020bcad22f3 100644
--- a/modules/openapi-generator/src/main/resources/php-slim-server/index.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim-server/index.mustache
@@ -64,7 +64,7 @@ $config['settings'] = [
     // 'addContentLengthHeader' => true,
 
     /**
-     * Filename for caching the FastRoute routes. Must be set to to a valid filename within
+     * Filename for caching the FastRoute routes. Must be set to a valid filename within
      * a writeable directory. If the file does not exist, then it is created with the correct
      * cache information on first run.
      * Set to false to disable the FastRoute cache system.
diff --git a/modules/openapi-generator/src/main/resources/php/ObjectSerializer.mustache b/modules/openapi-generator/src/main/resources/php/ObjectSerializer.mustache
index 5cd224a6e041..6639723ec508 100644
--- a/modules/openapi-generator/src/main/resources/php/ObjectSerializer.mustache
+++ b/modules/openapi-generator/src/main/resources/php/ObjectSerializer.mustache
@@ -436,7 +436,7 @@ class ObjectSerializer
         }
 
         if ($class === '\DateTime') {
-            // Some API's return an invalid, empty string as a
+            // Some APIs return an invalid, empty string as a
             // date-time property. DateTime::__construct() will return
             // the current time for empty input which is probably not
             // what is meant. The invalid empty string is probably to
@@ -446,7 +446,7 @@ class ObjectSerializer
                 try {
                     return new \DateTime($data);
                 } catch (\Exception $exception) {
-                    // Some API's return a date-time with too high nanosecond
+                    // Some APIs return a date-time with too high nanosecond
                     // precision for php's DateTime to handle.
                     // With provided regexp 6 digits of microseconds saved
                     return new \DateTime(self::sanitizeTimestamp($data));
diff --git a/modules/openapi-generator/src/main/resources/powershell/http_signature_auth.mustache b/modules/openapi-generator/src/main/resources/powershell/http_signature_auth.mustache
index 0206a18d7dee..532eb1a88fb5 100644
--- a/modules/openapi-generator/src/main/resources/powershell/http_signature_auth.mustache
+++ b/modules/openapi-generator/src/main/resources/powershell/http_signature_auth.mustache
@@ -112,7 +112,7 @@ function Get-{{{apiNamePrefix}}}HttpSignedHeader {
             -HashAlgorithmName $httpSigningConfiguration.HashAlgorithm `
             -KeyPassPhrase $httpSigningConfiguration.KeyPassPhrase
     }
-    #Depricated
+    #Deprecated
     <#$cryptographicScheme = Get-{{{apiNamePrefix}}}CryptographicScheme -SigningAlgorithm $httpSigningConfiguration.SigningAlgorithm `
                                                  -HashAlgorithm $httpSigningConfiguration.HashAlgorithm
     #>
diff --git a/modules/openapi-generator/src/main/resources/protobuf-schema/README.mustache b/modules/openapi-generator/src/main/resources/protobuf-schema/README.mustache
index 0724e27a954e..ab3985ea36c2 100644
--- a/modules/openapi-generator/src/main/resources/protobuf-schema/README.mustache
+++ b/modules/openapi-generator/src/main/resources/protobuf-schema/README.mustache
@@ -24,9 +24,9 @@ Below are some usage examples for Go and Ruby. For other languages, please refer
 ### Go
 ```
 # assuming `protoc-gen-go` has been installed with `go get -u github.com/golang/protobuf/protoc-gen-go`
-mkdir /var/tmp/go/{{{pacakgeName}}}
-protoc --go_out=/var/tmp/go/{{{pacakgeName}}} services/*
-protoc --go_out=/var/tmp/go/{{{pacakgeName}}} models/*
+mkdir /var/tmp/go/{{{packageName}}}
+protoc --go_out=/var/tmp/go/{{{packageName}}} services/*
+protoc --go_out=/var/tmp/go/{{{packageName}}} models/*
 ```
 
 ### Ruby
diff --git a/modules/openapi-generator/src/main/resources/python-aiohttp/README.mustache b/modules/openapi-generator/src/main/resources/python-aiohttp/README.mustache
index 42dd581c40e4..212961153cff 100644
--- a/modules/openapi-generator/src/main/resources/python-aiohttp/README.mustache
+++ b/modules/openapi-generator/src/main/resources/python-aiohttp/README.mustache
@@ -38,7 +38,7 @@ pytest
 
 ## Prevent file overriding
 
-After first generation, add edited files to _.openapi-generator-ignore_ to prevent generator to overwrite them. Typically:
+After first generation, add edited files to _.openapi-generator-ignore_ to prevent generator from overwriting them. Typically:
 ```
 server/controllers/*
 test/*
diff --git a/modules/openapi-generator/src/main/resources/python-prior/__init__models.mustache b/modules/openapi-generator/src/main/resources/python-prior/__init__models.mustache
index 76d91fc5d47f..6cbba3113d24 100644
--- a/modules/openapi-generator/src/main/resources/python-prior/__init__models.mustache
+++ b/modules/openapi-generator/src/main/resources/python-prior/__init__models.mustache
@@ -4,7 +4,7 @@
 # if you have many models here with many references from one model to another this may
 # raise a RecursionError
 # to avoid this, import only the models that you directly need like:
-# from from {{modelPackage}}.pet import Pet
+# from {{modelPackage}}.pet import Pet
 # or import this package, but before doing it, use:
 # import sys
 # sys.setrecursionlimit(n)
diff --git a/modules/openapi-generator/src/main/resources/python/__init__models.handlebars b/modules/openapi-generator/src/main/resources/python/__init__models.handlebars
index 31eac9cd5440..0899faf1da1d 100644
--- a/modules/openapi-generator/src/main/resources/python/__init__models.handlebars
+++ b/modules/openapi-generator/src/main/resources/python/__init__models.handlebars
@@ -6,7 +6,7 @@
 # if you have many models here with many references from one model to another this may
 # raise a RecursionError
 # to avoid this, import only the models that you directly need like:
-# from from {{packageName}}.{{modelPackage}}.pet import Pet
+# from {{packageName}}.{{modelPackage}}.pet import Pet
 # or import this package, but before doing it, use:
 # import sys
 # sys.setrecursionlimit(n)
diff --git a/modules/openapi-generator/src/main/resources/python/api_client.handlebars b/modules/openapi-generator/src/main/resources/python/api_client.handlebars
index 4379c88b823c..75d90cd2b1bb 100644
--- a/modules/openapi-generator/src/main/resources/python/api_client.handlebars
+++ b/modules/openapi-generator/src/main/resources/python/api_client.handlebars
@@ -1250,9 +1250,9 @@ class ApiClient:
                     # The HTTP signature scheme requires multiple HTTP headers
                     # that are calculated dynamically.
                     signing_info = self.configuration.signing_info
-                    querys = tuple()
+                    queries = tuple()
                     auth_headers = signing_info.get_http_signature_headers(
-                                        resource_path, method, headers, body, querys)
+                                        resource_path, method, headers, body, queries)
                     for key, value in auth_headers.items():
                         headers.add(key, value)
 {{/if}}
diff --git a/modules/openapi-generator/src/main/resources/python/configuration.handlebars b/modules/openapi-generator/src/main/resources/python/configuration.handlebars
index 8837fa9515df..26f940dde15a 100644
--- a/modules/openapi-generator/src/main/resources/python/configuration.handlebars
+++ b/modules/openapi-generator/src/main/resources/python/configuration.handlebars
@@ -134,7 +134,7 @@ conf = {{{packageName}}}.Configuration(
     'Authorization' header, which is used to carry the signature.
 
     One may be tempted to sign all headers by default, but in practice it rarely works.
-    This is beccause explicit proxies, transparent proxies, TLS termination endpoints or
+    This is because explicit proxies, transparent proxies, TLS termination endpoints or
     load balancers may add/modify/remove headers. Include the HTTP headers that you know
     are not going to be modified in transit.
 
@@ -328,7 +328,7 @@ conf = {{{packageName}}}.Configuration(
             self._disabled_client_side_validations = s
 {{#if hasHttpSignatureMethods}}
         if name == "signing_info" and value is not None:
-            # Ensure the host paramater from signing info is the same as
+            # Ensure the host parameter from signing info is the same as
             # Configuration.host.
             value.host = self.host
 {{/if}}
diff --git a/modules/openapi-generator/src/main/resources/python/git_push.sh.handlebars b/modules/openapi-generator/src/main/resources/python/git_push.sh.handlebars
index 8b3f689c9121..228d338ebdbf 100644
--- a/modules/openapi-generator/src/main/resources/python/git_push.sh.handlebars
+++ b/modules/openapi-generator/src/main/resources/python/git_push.sh.handlebars
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update" "gitlab.com"
 
 git_user_id=$1
 git_repo_id=$2
diff --git a/modules/openapi-generator/src/main/resources/python/schemas.handlebars b/modules/openapi-generator/src/main/resources/python/schemas.handlebars
index e61dd99ac708..2971f2898576 100644
--- a/modules/openapi-generator/src/main/resources/python/schemas.handlebars
+++ b/modules/openapi-generator/src/main/resources/python/schemas.handlebars
@@ -378,7 +378,7 @@ class Schema:
             _validate_oapg returns a key value pair
             where the key is the path to the item, and the value will be the required manufactured class
             made out of the matching schemas
-        2. value is an instance of the the correct schema type
+        2. value is an instance of the correct schema type
             the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
             for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
             and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
@@ -861,7 +861,7 @@ class ValidatorBase:
             schema_keyword not in configuration._disabled_client_side_validations)
 
     @staticmethod
-    def _raise_validation_errror_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=""):
+    def _raise_validation_error_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=""):
         raise ApiValueError(
             "Invalid value `{value}`, {constraint_msg} `{constraint_value}`{additional_txt} at {path_to_item}".format(
                 value=value,
@@ -956,7 +956,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_length') and
                 len(arg) > cls.MetaOapg.max_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="length must be less than or equal to",
                 constraint_value=cls.MetaOapg.max_length,
@@ -966,7 +966,7 @@ class StrBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_length') and
                 len(arg) < cls.MetaOapg.min_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="length must be greater than or equal to",
                 constraint_value=cls.MetaOapg.min_length,
@@ -981,14 +981,14 @@ class StrBase(ValidatorBase):
                     if flags != 0:
                         # Don't print the regex flags if the flags are not
                         # specified in the OAS document.
-                        cls._raise_validation_errror_message_oapg(
+                        cls._raise_validation_error_message_oapg(
                             value=arg,
                             constraint_msg="must match regular expression",
                             constraint_value=regex_dict['pattern'],
                             path_to_item=validation_metadata.path_to_item,
                             additional_txt=" with flags=`{}`".format(flags)
                         )
-                    cls._raise_validation_errror_message_oapg(
+                    cls._raise_validation_error_message_oapg(
                         value=arg,
                         constraint_msg="must match regular expression",
                         constraint_value=regex_dict['pattern'],
@@ -1204,7 +1204,7 @@ class NumberBase(ValidatorBase):
             return self._as_float
         except AttributeError:
             if self.as_tuple().exponent >= 0:
-                raise ApiValueError(f'{self} is not an float')
+                raise ApiValueError(f'{self} is not a float')
             self._as_float = float(self)
             return self._as_float
 
@@ -1221,7 +1221,7 @@ class NumberBase(ValidatorBase):
             multiple_of_value = cls.MetaOapg.multiple_of
             if (not (float(arg) / multiple_of_value).is_integer()):
                 # Note 'multipleOf' will be as good as the floating point arithmetic.
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg="value must be a multiple of",
                     constraint_value=multiple_of_value,
@@ -1242,7 +1242,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMaximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_maximum') and
                 arg >= cls.MetaOapg.exclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="must be a value less than",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -1252,7 +1252,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_maximum') and
                 arg > cls.MetaOapg.inclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="must be a value less than or equal to",
                 constraint_value=cls.MetaOapg.inclusive_maximum,
@@ -1262,7 +1262,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('exclusiveMinimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_minimum') and
                 arg <= cls.MetaOapg.exclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="must be a value greater than",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -1272,7 +1272,7 @@ class NumberBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_minimum') and
                 arg < cls.MetaOapg.inclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="must be a value greater than or equal to",
                 constraint_value=cls.MetaOapg.inclusive_minimum,
@@ -1340,7 +1340,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_items') and
                 len(arg) > cls.MetaOapg.max_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="number of items must be less than or equal to",
                 constraint_value=cls.MetaOapg.max_items,
@@ -1350,7 +1350,7 @@ class ListBase(ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_items') and
                 len(arg) < cls.MetaOapg.min_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="number of items must be greater than or equal to",
                 constraint_value=cls.MetaOapg.min_items,
@@ -1361,7 +1361,7 @@ class ListBase(ValidatorBase):
                 hasattr(cls.MetaOapg, 'unique_items') and cls.MetaOapg.unique_items and arg):
             unique_items = set(arg)
             if len(arg) > len(unique_items):
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg="duplicate items were found, and the tuple must not contain duplicates because",
                     constraint_value='unique_items==True',
@@ -1604,7 +1604,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('maxProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_properties') and
                 len(arg) > cls.MetaOapg.max_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="number of properties must be less than or equal to",
                 constraint_value=cls.MetaOapg.max_properties,
@@ -1614,7 +1614,7 @@ class DictBase(Discriminable, ValidatorBase):
         if (cls._is_json_validation_enabled_oapg('minProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_properties') and
                 len(arg) < cls.MetaOapg.min_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="number of properties must be greater than or equal to",
                 constraint_value=cls.MetaOapg.min_properties,
diff --git a/modules/openapi-generator/src/main/resources/python/signing.handlebars b/modules/openapi-generator/src/main/resources/python/signing.handlebars
index 26d2b8cb37c9..a853a998ef4f 100644
--- a/modules/openapi-generator/src/main/resources/python/signing.handlebars
+++ b/modules/openapi-generator/src/main/resources/python/signing.handlebars
@@ -334,7 +334,7 @@ class HttpSigningConfiguration(object):
         :return: A tuple of (digest, prefix).
             The digest is a hashing object that contains the cryptographic digest of
             the HTTP request.
-            The prefix is a string that identifies the cryptographc hash. It is used
+            The prefix is a string that identifies the cryptographic hash. It is used
             to generate the 'Digest' header as specified in RFC 3230.
         """
         if self.hash_algorithm == HASH_SHA512:
diff --git a/modules/openapi-generator/src/main/resources/r/ApiResponse.mustache b/modules/openapi-generator/src/main/resources/r/ApiResponse.mustache
index ca8c3f785824..c2e9eb5be477 100644
--- a/modules/openapi-generator/src/main/resources/r/ApiResponse.mustache
+++ b/modules/openapi-generator/src/main/resources/r/ApiResponse.mustache
@@ -6,7 +6,7 @@
 #' @field content The deserialized response body.
 #' @field response The raw response from the endpoint.
 #' @field status_code The HTTP response status code.
-#' @field status_code_desc The brief descriptoin of the HTTP response status code.
+#' @field status_code_desc The brief description of the HTTP response status code.
 #' @field headers The HTTP response headers.
 #' @export
 ApiResponse <- R6::R6Class(
diff --git a/modules/openapi-generator/src/main/resources/r/api.mustache b/modules/openapi-generator/src/main/resources/r/api.mustache
index a49694f8a073..46067f6d5280 100644
--- a/modules/openapi-generator/src/main/resources/r/api.mustache
+++ b/modules/openapi-generator/src/main/resources/r/api.mustache
@@ -386,7 +386,7 @@
       # check if items are unique
       if (!identical(`{{{paramName}}}`, unique(`{{{paramName}}}`))) {
         {{#useDefaultExceptionHandling}}
-        stop("Invalid value for {{{paramName}}} when calling {{classname}}${{operationId}}. Items must be unqiue.")
+        stop("Invalid value for {{{paramName}}} when calling {{classname}}${{operationId}}. Items must be unique.")
         {{/useDefaultExceptionHandling}}
         {{#useRlangExceptionHandling}}
         rlang::abort(message = "Invalid value for `{{paramName}}` when calling {{classname}}${{operationId}}. Items must be unique.",
diff --git a/modules/openapi-generator/src/main/resources/r/api_client.mustache b/modules/openapi-generator/src/main/resources/r/api_client.mustache
index 395ff41be4e7..9530234c8c49 100644
--- a/modules/openapi-generator/src/main/resources/r/api_client.mustache
+++ b/modules/openapi-generator/src/main/resources/r/api_client.mustache
@@ -411,10 +411,10 @@ ApiClient <- R6::R6Class(
       }
       return_obj
     },
-    #' Return a propery header (for accept or content-type).
+    #' Return a property header (for accept or content-type).
     #'
     #' @description
-    #' Return a propery header (for accept or content-type). If JSON-related MIME is found,
+    #' Return a property header (for accept or content-type). If JSON-related MIME is found,
     #' return it. Otherwise, return the first one, if any.
     #'
     #' @param headers A list of headers
diff --git a/modules/openapi-generator/src/main/resources/r/libraries/httr2/api_client.mustache b/modules/openapi-generator/src/main/resources/r/libraries/httr2/api_client.mustache
index fd9ddd884b6e..decfe50f1d05 100644
--- a/modules/openapi-generator/src/main/resources/r/libraries/httr2/api_client.mustache
+++ b/modules/openapi-generator/src/main/resources/r/libraries/httr2/api_client.mustache
@@ -171,7 +171,7 @@ ApiClient  <- R6::R6Class(
     #' @param header_params The header parameters.
     #' @param form_params The form parameters.
     #' @param file_params The form parameters to upload files.
-    #' @param accepts The HTTP accpet headers.
+    #' @param accepts The HTTP accept headers.
     #' @param content_types The HTTP content-type headers.
     #' @param body The HTTP request body.
     #' @param is_oauth True if the endpoints required OAuth authentication.
@@ -202,7 +202,7 @@ ApiClient  <- R6::R6Class(
     #' @param header_params The header parameters.
     #' @param form_params The form parameters.
     #' @param file_params The form parameters for uploading files.
-    #' @param accepts The HTTP accpet headers.
+    #' @param accepts The HTTP accept headers.
     #' @param content_types The HTTP content-type headers.
     #' @param body The HTTP request body.
     #' @param is_oauth True if the endpoints required OAuth authentication.
@@ -416,10 +416,10 @@ ApiClient  <- R6::R6Class(
       }
       return_obj
     },
-    #' Return a propery header (for accept or content-type).
+    #' Return a property header (for accept or content-type).
     #'
     #' @description
-    #' Return a propery header (for accept or content-type). If JSON-related MIME is found,
+    #' Return a property header (for accept or content-type). If JSON-related MIME is found,
     #' return it. Otherwise, return the first one, if any.
     #'
     #' @param headers A list of headers
diff --git a/modules/openapi-generator/src/main/resources/r/modelAnyOf.mustache b/modules/openapi-generator/src/main/resources/r/modelAnyOf.mustache
index 84cc761b407a..f16a9cd2d1b6 100644
--- a/modules/openapi-generator/src/main/resources/r/modelAnyOf.mustache
+++ b/modules/openapi-generator/src/main/resources/r/modelAnyOf.mustache
@@ -169,7 +169,7 @@
 ## Uncomment below to unlock the class to allow modifications of the method or field
 #{{classname}}$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 #{{classname}}$set("public", "print", function(...) {
 #  print(jsonlite::prettify(self$toJSONString()))
 #  invisible(self)
diff --git a/modules/openapi-generator/src/main/resources/r/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/r/modelGeneric.mustache
index 451f41a5b426..a75dd49ae007 100644
--- a/modules/openapi-generator/src/main/resources/r/modelGeneric.mustache
+++ b/modules/openapi-generator/src/main/resources/r/modelGeneric.mustache
@@ -46,7 +46,7 @@
     #' @param {{name}} {{#lambdaRdocEscape}}{{{description}}}{{/lambdaRdocEscape}}{{^description}}{{{name}}}{{/description}}{{#defaultValue}}. Default to {{{.}}}.{{/defaultValue}}
     {{/optionalVars}}
     {{#isAdditionalPropertiesTrue}}
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     {{/isAdditionalPropertiesTrue}}
     #' @param ... Other optional arguments.
     #' @export
@@ -673,7 +673,7 @@
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # {{classname}}$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # {{classname}}$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/modules/openapi-generator/src/main/resources/r/modelOneOf.mustache b/modules/openapi-generator/src/main/resources/r/modelOneOf.mustache
index da27bdfb2d7c..f692ca1288be 100644
--- a/modules/openapi-generator/src/main/resources/r/modelOneOf.mustache
+++ b/modules/openapi-generator/src/main/resources/r/modelOneOf.mustache
@@ -221,7 +221,7 @@
 ## Uncomment below to unlock the class to allow modifications of the method or field
 #{{classname}}$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 #{{classname}}$set("public", "print", function(...) {
 #  print(jsonlite::prettify(self$toJSONString()))
 #  invisible(self)
diff --git a/modules/openapi-generator/src/main/resources/rust-server/models.mustache b/modules/openapi-generator/src/main/resources/rust-server/models.mustache
index 30be5a54f35f..f7b9c395a526 100644
--- a/modules/openapi-generator/src/main/resources/rust-server/models.mustache
+++ b/modules/openapi-generator/src/main/resources/rust-server/models.mustache
@@ -12,7 +12,7 @@ use crate::header;
 {{/description}}
 {{#isEnum}}
 /// Enumeration of values.
-/// Since this enum's variants do not hold data, we can easily define them them as `#[repr(C)]`
+/// Since this enum's variants do not hold data, we can easily define them as `#[repr(C)]`
 /// which helps with FFI.
 #[allow(non_camel_case_types)]
 #[repr(C)]
diff --git a/modules/openapi-generator/src/main/resources/scala-akka-client/apiInvoker.mustache b/modules/openapi-generator/src/main/resources/scala-akka-client/apiInvoker.mustache
index ae815e21c637..13a3e6d0e969 100644
--- a/modules/openapi-generator/src/main/resources/scala-akka-client/apiInvoker.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-akka-client/apiInvoker.mustache
@@ -39,7 +39,7 @@ object ApiInvoker {
     * Allows request execution without calling apiInvoker.execute(request)
     * request.response can be used to get a future of the ApiResponse generated.
     * request.result can be used to get a future of the expected ApiResponse content. If content doesn't match, a
-    * Future will failed with a ClassCastException
+    * Future will fail with a ClassCastException
     *
     * @param request the apiRequest to be executed
     */
diff --git a/modules/openapi-generator/src/main/resources/scalatra/web.xml b/modules/openapi-generator/src/main/resources/scalatra/web.xml
index bf99b058082c..3003f2941be9 100644
--- a/modules/openapi-generator/src/main/resources/scalatra/web.xml
+++ b/modules/openapi-generator/src/main/resources/scalatra/web.xml
@@ -7,7 +7,7 @@
 
   
   
diff --git a/modules/openapi-generator/src/main/resources/swift5/APIHelper.mustache b/modules/openapi-generator/src/main/resources/swift5/APIHelper.mustache
index 19763896035d..95cf790b2802 100644
--- a/modules/openapi-generator/src/main/resources/swift5/APIHelper.mustache
+++ b/modules/openapi-generator/src/main/resources/swift5/APIHelper.mustache
@@ -65,7 +65,7 @@ import Vapor{{/useVapor}}
 
     /// maps all values from source to query parameters
     ///
-    /// explode attribute is respected: collection values might be either joined or split up into seperate key value pairs
+    /// explode attribute is respected: collection values might be either joined or split up into separate key value pairs
     {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} static func mapValuesToQueryItems(_ source: [String: (wrappedValue: Any?, isExplode: Bool)]) -> [URLQueryItem]? {
         let destination = source.filter { $0.value.wrappedValue != nil }.reduce(into: [URLQueryItem]()) { result, item in
             if let collection = item.value.wrappedValue as? [Any?] {
diff --git a/modules/openapi-generator/src/main/resources/swift5/api.mustache b/modules/openapi-generator/src/main/resources/swift5/api.mustache
index 8ae155fc073b..4efc57d9e345 100644
--- a/modules/openapi-generator/src/main/resources/swift5/api.mustache
+++ b/modules/openapi-generator/src/main/resources/swift5/api.mustache
@@ -284,7 +284,7 @@ extension {{projectName}}API {
      defaultResponse: {{.}}{{/defaultResponse}}
      {{#authMethods}}
      - {{#isBasic}}BASIC{{/isBasic}}{{#isOAuth}}OAuth{{/isOAuth}}{{#isApiKey}}API Key{{/isApiKey}}:
-       - type: {{type}}{{#keyParamName}} {{keyParamName}} {{#isKeyInQuery}}(QUERY){{/isKeyInQuery}}{{#isKeyInHeaer}}(HEADER){{/isKeyInHeaer}}{{/keyParamName}}
+       - type: {{type}}{{#keyParamName}} {{keyParamName}} {{#isKeyInQuery}}(QUERY){{/isKeyInQuery}}{{#isKeyInHeader}}(HEADER){{/isKeyInHeader}}{{/keyParamName}}
        - name: {{name}}
        {{/authMethods}}
      {{#hasResponseHeaders}}
@@ -364,7 +364,7 @@ extension {{projectName}}API {
      defaultResponse: {{.}}{{/defaultResponse}}
      {{#authMethods}}
      - {{#isBasic}}BASIC{{/isBasic}}{{#isOAuth}}OAuth{{/isOAuth}}{{#isApiKey}}API Key{{/isApiKey}}:
-       - type: {{type}}{{#keyParamName}} {{keyParamName}} {{#isKeyInQuery}}(QUERY){{/isKeyInQuery}}{{#isKeyInHeaer}}(HEADER){{/isKeyInHeaer}}{{/keyParamName}}
+       - type: {{type}}{{#keyParamName}} {{keyParamName}} {{#isKeyInQuery}}(QUERY){{/isKeyInQuery}}{{#isKeyInHeader}}(HEADER){{/isKeyInHeader}}{{/keyParamName}}
        - name: {{name}}
        {{/authMethods}}
      {{#hasResponseHeaders}}
@@ -408,7 +408,7 @@ extension {{projectName}}API {
      - defaultResponse: {{.}}{{/defaultResponse}}
      {{#authMethods}}
      - {{#isBasic}}BASIC{{/isBasic}}{{#isOAuth}}OAuth{{/isOAuth}}{{#isApiKey}}API Key{{/isApiKey}}:
-       - type: {{type}}{{#keyParamName}} {{keyParamName}} {{#isKeyInQuery}}(QUERY){{/isKeyInQuery}}{{#isKeyInHeaer}}(HEADER){{/isKeyInHeaer}}{{/keyParamName}}
+       - type: {{type}}{{#keyParamName}} {{keyParamName}} {{#isKeyInQuery}}(QUERY){{/isKeyInQuery}}{{#isKeyInHeader}}(HEADER){{/isKeyInHeader}}{{/keyParamName}}
        - name: {{name}}
        {{/authMethods}}
      {{#hasResponseHeaders}}
diff --git a/modules/openapi-generator/src/main/resources/typescript-aurelia/README.md b/modules/openapi-generator/src/main/resources/typescript-aurelia/README.md
index 39a6c22b2e20..1475a466d64a 100644
--- a/modules/openapi-generator/src/main/resources/typescript-aurelia/README.md
+++ b/modules/openapi-generator/src/main/resources/typescript-aurelia/README.md
@@ -27,7 +27,7 @@ npm run build
 ```
 
 #### NPM ####
-You may publish the module to NPM. In this case, you would be able to install the module as any other NPM module. It maybe useful to use [scoped packages](https://docs.npmjs.com/misc/scope).
+You may publish the module to NPM. In this case, you would be able to install the module as any other NPM module. It may be useful to use [scoped packages](https://docs.npmjs.com/misc/scope).
 
 You can also use `npm link` to link the module. However, this would not modify `package.json` of the installing project, as such you would need to relink every time you deploy that project. 
 
diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache
index 45e2a56434e8..b47cf55c452f 100644
--- a/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache
@@ -135,7 +135,7 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
@@ -144,13 +144,13 @@ export class BaseAPI {
         };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
index cfdc60aa0aa5..593a45266b58 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
@@ -4209,7 +4209,7 @@ public void testUnalias() {
         Assert.assertNotNull(openAPI.getComponents().getSchemas().get(ModelUtils.getSimpleRef(requestBodySchema.get$ref())));
 
         Schema requestBodySchema2 = ModelUtils.unaliasSchema(openAPI, requestBodySchema);
-        // get$ref is not null as unaliasSchem returns the schema with the last $ref to the actual schema
+        // get$ref is not null as unaliasSchema returns the schema with the last $ref to the actual schema
         Assert.assertNotNull(requestBodySchema2.get$ref());
         Assert.assertEquals(requestBodySchema2.get$ref(), "#/components/schemas/updatePetWithForm_request");
 
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java
index 1fa2e72554cd..7f5937ee7cb8 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java
@@ -715,8 +715,8 @@ public void arrayNullableDefaultValueTests() throws Exception {
                 "\nprivate @Valid List arrayThatIsNull = null;\n");
 
         //And the generated model contains correct default value for array properties (required, nullable)
-        TestUtils.ensureContainsFile(files, output, "src/gen/java/org/openapitools/model/BodyWithRequiredNullalble.java");
-        assertFileContains(output.toPath().resolve("src/gen/java/org/openapitools/model/BodyWithRequiredNullalble.java"),
+        TestUtils.ensureContainsFile(files, output, "src/gen/java/org/openapitools/model/BodyWithRequiredNullable.java");
+        assertFileContains(output.toPath().resolve("src/gen/java/org/openapitools/model/BodyWithRequiredNullable.java"),
                 "\nprivate @Valid List arrayThatIsNull = null;\n");
 
         //And the generated model contains correct default value for array properties (required)
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java
index bec4ee24ce17..d97a3c6ab44b 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java
@@ -859,8 +859,8 @@ public void doGeneratePathVariableForSimpleParam() throws IOException {
         assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/api/BearsApi.java"), "@PathVariable");
         assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/api/CamelsApi.java"), "allowableValues = \"sleeping, awake\"");
         assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/api/CamelsApi.java"), "@PathVariable");
-        assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/api/GirafesApi.java"), "allowableValues = \"0, 1\"");
-        assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/api/GirafesApi.java"), "@PathVariable");
+        assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/api/GiraffesApi.java"), "allowableValues = \"0, 1\"");
+        assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/api/GiraffesApi.java"), "@PathVariable");
     }
 
     @Test
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift5/Swift5ModelEnumTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift5/Swift5ModelEnumTest.java
index 495e7ffa7d93..16493f7440b2 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift5/Swift5ModelEnumTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift5/Swift5ModelEnumTest.java
@@ -35,7 +35,7 @@
 
 @SuppressWarnings("static-method")
 public class Swift5ModelEnumTest {
-    @Test(description = "convert a java model with an string enum and a default value")
+    @Test(description = "convert a java model with a string enum and a default value")
     public void convertStringDefaultValueTest() {
         final StringSchema enumSchema = new StringSchema();
         enumSchema.setEnum(Arrays.asList("VALUE1", "VALUE2", "VALUE3"));
@@ -59,7 +59,7 @@ public void convertStringDefaultValueTest() {
         Assert.assertTrue(enumVar.isEnum);
     }
 
-    @Test(description = "convert a java model with an reserved word string enum and a default value")
+    @Test(description = "convert a java model with a reserved word string enum and a default value")
     public void convertReservedWordStringDefaultValueTest() {
         final StringSchema enumSchema = new StringSchema();
         enumSchema.setEnum(Arrays.asList("1st", "2nd", "3rd"));
@@ -107,7 +107,7 @@ public void convertIntegerDefaultValueTest() {
         Assert.assertTrue(enumVar.isEnum);
     }
 
-    @Test(description = "convert a java model with an number enum and a default value")
+    @Test(description = "convert a java model with a number enum and a default value")
     public void convertNumberDefaultValueTest() {
         final NumberSchema enumSchema = new NumberSchema();
         enumSchema.setEnum(Arrays.asList(new BigDecimal(10), new BigDecimal(100), new BigDecimal(1000)));
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java
index cdd43b5b0905..7a769cc8d199 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java
@@ -21,7 +21,7 @@
 @Test(groups = {TYPESCRIPT})
 public class SharedTypeScriptTest {
     @Test
-    public void typesInImportsAreSplittedTest() throws IOException {
+    public void typesInImportsAreSplitTest() throws IOException {
         CodegenConfigurator config =
                 new CodegenConfigurator()
                         .setInputSpec("src/test/resources/split-import.json")
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptnode/TypeScriptNodeModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptnode/TypeScriptNodeModelTest.java
index 42b7fbe1b42a..23e342f4bc27 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptnode/TypeScriptNodeModelTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptnode/TypeScriptNodeModelTest.java
@@ -297,7 +297,7 @@ public void arrayModelAdditionalPropertiesArrayTest() {
         Assert.assertEquals(cm.additionalPropertiesType, "Array");
     }
 
-    @Test(description = "convert an string additional properties model")
+    @Test(description = "convert a string additional properties model")
     public void arrayModelAdditionalPropertiesStringTest() {
         final Schema schema = new Schema()
                 .description("a map model")
@@ -313,7 +313,7 @@ public void arrayModelAdditionalPropertiesStringTest() {
         Assert.assertEquals(cm.additionalPropertiesType, "string");
     }
 
-    @Test(description = "convert an complex additional properties model")
+    @Test(description = "convert a complex additional properties model")
     public void arrayModelAdditionalPropertiesComplexTest() {
         final Schema schema = new Schema()
                 .description("a map model")
diff --git a/modules/openapi-generator/src/test/resources/2_0/globalSecurity.json b/modules/openapi-generator/src/test/resources/2_0/globalSecurity.json
index 5cadaaa2bc2b..efecc7ee6b48 100644
--- a/modules/openapi-generator/src/test/resources/2_0/globalSecurity.json
+++ b/modules/openapi-generator/src/test/resources/2_0/globalSecurity.json
@@ -471,7 +471,7 @@
           "store"
         ],
         "summary": "Find purchase order by ID",
-        "description": "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        "description": "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         "operationId": "getOrderById",
         "produces": [
           "application/json",
diff --git a/modules/openapi-generator/src/test/resources/2_0/long_description_issue_7839.json b/modules/openapi-generator/src/test/resources/2_0/long_description_issue_7839.json
index 99265c90dce2..e50678f6cdd0 100644
--- a/modules/openapi-generator/src/test/resources/2_0/long_description_issue_7839.json
+++ b/modules/openapi-generator/src/test/resources/2_0/long_description_issue_7839.json
@@ -360,7 +360,7 @@
       "get" : {
         "tags" : [ "store" ],
         "summary" : "Find purchase order by ID",
-        "description" : "For valid response try integer IDs with value >= 1 and <= 10.\\ \\ Other values will generated exceptions",
+        "description" : "For valid response try integer IDs with value >= 1 and <= 10.\\ \\ Other values will generate exceptions",
         "operationId" : "getOrderById",
         "produces" : [ "application/json", "application/xml" ],
         "parameters" : [ {
diff --git a/modules/openapi-generator/src/test/resources/2_0/petstore-bash.json b/modules/openapi-generator/src/test/resources/2_0/petstore-bash.json
index 964b47418d02..cc93278ae86a 100644
--- a/modules/openapi-generator/src/test/resources/2_0/petstore-bash.json
+++ b/modules/openapi-generator/src/test/resources/2_0/petstore-bash.json
@@ -512,7 +512,7 @@
                "store"
             ],
             "summary":"Find purchase order by ID",
-            "description":"For valid response try integer IDs with value >= 1 and <= 10. Other values will generated exceptions",
+            "description":"For valid response try integer IDs with value >= 1 and <= 10. Other values will generate exceptions",
             "operationId":"getOrderById",
             "produces":[  
                "application/xml",
diff --git a/modules/openapi-generator/src/test/resources/2_0/petstore-nullable.yaml b/modules/openapi-generator/src/test/resources/2_0/petstore-nullable.yaml
index 9a7e2e9c5f95..b68004726ed8 100644
--- a/modules/openapi-generator/src/test/resources/2_0/petstore-nullable.yaml
+++ b/modules/openapi-generator/src/test/resources/2_0/petstore-nullable.yaml
@@ -323,7 +323,7 @@ paths:
       tags:
         - store
       summary: Find purchase order by ID
-      description: 'For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions'
+      description: 'For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions'
       operationId: getOrderById
       produces:
         - application/xml
diff --git a/modules/openapi-generator/src/test/resources/2_0/petstore-orig.json b/modules/openapi-generator/src/test/resources/2_0/petstore-orig.json
index 907bfd791136..9f8689649350 100644
--- a/modules/openapi-generator/src/test/resources/2_0/petstore-orig.json
+++ b/modules/openapi-generator/src/test/resources/2_0/petstore-orig.json
@@ -471,7 +471,7 @@
           "store"
         ],
         "summary": "Find purchase order by ID",
-        "description": "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        "description": "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         "operationId": "getOrderById",
         "produces": [
           "application/json",
diff --git a/modules/openapi-generator/src/test/resources/2_0/petstore-proto.yaml b/modules/openapi-generator/src/test/resources/2_0/petstore-proto.yaml
index f6d9efaa4c95..77cbbb72c3b8 100644
--- a/modules/openapi-generator/src/test/resources/2_0/petstore-proto.yaml
+++ b/modules/openapi-generator/src/test/resources/2_0/petstore-proto.yaml
@@ -325,7 +325,7 @@ paths:
       tags:
         - store
       summary: Find purchase order by ID
-      description: 'For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions'
+      description: 'For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions'
       operationId: getOrderById
       produces:
         - application/xml
diff --git a/modules/openapi-generator/src/test/resources/2_0/petstore-vendor-mime.yaml b/modules/openapi-generator/src/test/resources/2_0/petstore-vendor-mime.yaml
index 4bf2f04d9680..118f66d37acb 100644
--- a/modules/openapi-generator/src/test/resources/2_0/petstore-vendor-mime.yaml
+++ b/modules/openapi-generator/src/test/resources/2_0/petstore-vendor-mime.yaml
@@ -319,7 +319,7 @@ paths:
       tags:
         - store
       summary: Find purchase order by ID
-      description: 'For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions'
+      description: 'For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions'
       operationId: getOrderById
       produces:
         - application/xml
diff --git a/modules/openapi-generator/src/test/resources/2_0/petstore-with-date-field.yaml b/modules/openapi-generator/src/test/resources/2_0/petstore-with-date-field.yaml
index 017e66b427e2..28d56302b7b8 100644
--- a/modules/openapi-generator/src/test/resources/2_0/petstore-with-date-field.yaml
+++ b/modules/openapi-generator/src/test/resources/2_0/petstore-with-date-field.yaml
@@ -314,7 +314,7 @@ paths:
       tags:
         - store
       summary: Find purchase order by ID
-      description: 'For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions'
+      description: 'For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions'
       operationId: getOrderById
       produces:
         - application/xml
diff --git a/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-for-testing-playframework-with-security.yaml b/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-for-testing-playframework-with-security.yaml
index be54ca6da2b6..4ef75a199d37 100644
--- a/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-for-testing-playframework-with-security.yaml
+++ b/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-for-testing-playframework-with-security.yaml
@@ -109,7 +109,7 @@ paths:
 securityDefinitions:
   petstore_token:
     type: oauth2
-    description: security definition for using keycloak authentification with control site.
+    description: security definition for using keycloak authentication with control site.
     authorizationUrl: https://keycloak-dev.business.stingray.com/auth/realms/CSLocal/protocol/openid-connect/auth
     tokenUrl: https://keycloak-dev.business.stingray.com/auth/realms/CSLocal/protocol/openid-connect/token
     x-jwksUrl: https://keycloak-dev.business.stingray.com/auth/realms/CSLocal/protocol/openid-connect/certs
diff --git a/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-saga-and-records.yaml b/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-saga-and-records.yaml
index 29c48ddc0bd0..babf447f2f1a 100644
--- a/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-saga-and-records.yaml
+++ b/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-saga-and-records.yaml
@@ -511,7 +511,7 @@ paths:
       tags:
         - store
       summary: Find purchase order by ID
-      description: 'For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions'
+      description: 'For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions'
       operationId: getOrderById
       produces:
         - application/xml
diff --git a/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml b/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml
index ad0619d82194..3f8a66e2a1bc 100644
--- a/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml
+++ b/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml
@@ -329,7 +329,7 @@ paths:
       tags:
         - store
       summary: Find purchase order by ID
-      description: 'For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions'
+      description: 'For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions'
       operationId: getOrderById
       produces:
         - application/xml
@@ -839,7 +839,7 @@ paths:
           description: Integer in group parameters
       responses:
         '400':
-          description: Someting wrong
+          description: Something wrong
   /fake/outer/number:
     post:
       tags:
diff --git a/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
index 5c9ae2bab700..91aa8232ec2b 100644
--- a/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+++ b/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
@@ -329,7 +329,7 @@ paths:
       tags:
         - store
       summary: Find purchase order by ID
-      description: 'For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions'
+      description: 'For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions'
       operationId: getOrderById
       produces:
         - application/xml
@@ -837,7 +837,7 @@ paths:
           description: Integer in group parameters
       responses:
         '400':
-          description: Someting wrong
+          description: Something wrong
   /fake/outer/number:
     post:
       tags:
diff --git a/modules/openapi-generator/src/test/resources/2_0/petstore-with-operations-without-required-params.yaml b/modules/openapi-generator/src/test/resources/2_0/petstore-with-operations-without-required-params.yaml
index a0b89db03139..cdc9e693f444 100644
--- a/modules/openapi-generator/src/test/resources/2_0/petstore-with-operations-without-required-params.yaml
+++ b/modules/openapi-generator/src/test/resources/2_0/petstore-with-operations-without-required-params.yaml
@@ -321,7 +321,7 @@ paths:
       tags:
         - store
       summary: Find purchase order by ID
-      description: 'For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions'
+      description: 'For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions'
       operationId: getOrderById
       produces:
         - application/xml
diff --git a/modules/openapi-generator/src/test/resources/2_0/petstore-with-spring-pageable.yaml b/modules/openapi-generator/src/test/resources/2_0/petstore-with-spring-pageable.yaml
index e102f7dc11fc..9a1152bb06ac 100644
--- a/modules/openapi-generator/src/test/resources/2_0/petstore-with-spring-pageable.yaml
+++ b/modules/openapi-generator/src/test/resources/2_0/petstore-with-spring-pageable.yaml
@@ -323,7 +323,7 @@ paths:
       tags:
         - store
       summary: Find purchase order by ID
-      description: 'For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions'
+      description: 'For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions'
       operationId: getOrderById
       produces:
         - application/xml
diff --git a/modules/openapi-generator/src/test/resources/2_0/petstore.json b/modules/openapi-generator/src/test/resources/2_0/petstore.json
index 1eac6b45a4f9..5deda4b94ce5 100644
--- a/modules/openapi-generator/src/test/resources/2_0/petstore.json
+++ b/modules/openapi-generator/src/test/resources/2_0/petstore.json
@@ -482,7 +482,7 @@
           "store"
         ],
         "summary": "Find purchase order by ID",
-        "description": "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        "description": "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         "operationId": "getOrderById",
         "produces": [
           "application/json",
diff --git a/modules/openapi-generator/src/test/resources/2_0/petstore.yaml b/modules/openapi-generator/src/test/resources/2_0/petstore.yaml
index 5cc2f3becb99..36a05a5f6fe9 100644
--- a/modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+++ b/modules/openapi-generator/src/test/resources/2_0/petstore.yaml
@@ -321,7 +321,7 @@ paths:
       tags:
         - store
       summary: Find purchase order by ID
-      description: 'For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions'
+      description: 'For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions'
       operationId: getOrderById
       produces:
         - application/xml
diff --git a/modules/openapi-generator/src/test/resources/2_0/petstore_issue_7999.json b/modules/openapi-generator/src/test/resources/2_0/petstore_issue_7999.json
index 5a60bffefc51..c48c37f0f9a4 100644
--- a/modules/openapi-generator/src/test/resources/2_0/petstore_issue_7999.json
+++ b/modules/openapi-generator/src/test/resources/2_0/petstore_issue_7999.json
@@ -482,7 +482,7 @@
           "store"
         ],
         "summary": "Find purchase order by ID",
-        "description": "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        "description": "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         "operationId": "getOrderById",
         "produces": [
           "application/json",
diff --git a/modules/openapi-generator/src/test/resources/2_0/python-prior/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/2_0/python-prior/petstore-with-fake-endpoints-models-for-testing.yaml
index 0fd88cfd5ae3..2e7206f91144 100644
--- a/modules/openapi-generator/src/test/resources/2_0/python-prior/petstore-with-fake-endpoints-models-for-testing.yaml
+++ b/modules/openapi-generator/src/test/resources/2_0/python-prior/petstore-with-fake-endpoints-models-for-testing.yaml
@@ -334,7 +334,7 @@ paths:
       tags:
         - store
       summary: Find purchase order by ID
-      description: 'For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions'
+      description: 'For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions'
       operationId: getOrderById
       produces:
         - application/xml
@@ -842,7 +842,7 @@ paths:
           description: Integer in group parameters
       responses:
         '400':
-          description: Someting wrong
+          description: Something wrong
   /fake/refs/number:
     post:
       tags:
diff --git a/modules/openapi-generator/src/test/resources/2_0/rust-server/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/2_0/rust-server/petstore-with-fake-endpoints-models-for-testing.yaml
index 8f081c09dc15..3595c5b50361 100644
--- a/modules/openapi-generator/src/test/resources/2_0/rust-server/petstore-with-fake-endpoints-models-for-testing.yaml
+++ b/modules/openapi-generator/src/test/resources/2_0/rust-server/petstore-with-fake-endpoints-models-for-testing.yaml
@@ -321,7 +321,7 @@ paths:
       tags:
         - store
       summary: Find purchase order by ID
-      description: 'For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions'
+      description: 'For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions'
       operationId: getOrderById
       produces:
         - application/xml
diff --git a/modules/openapi-generator/src/test/resources/2_0/rust-server/rust-server-test.yaml b/modules/openapi-generator/src/test/resources/2_0/rust-server/rust-server-test.yaml
index c7937795ced1..49a5b9612245 100644
--- a/modules/openapi-generator/src/test/resources/2_0/rust-server/rust-server-test.yaml
+++ b/modules/openapi-generator/src/test/resources/2_0/rust-server/rust-server-test.yaml
@@ -139,7 +139,7 @@ definitions:
   baseAllOf:
     type: object
     properties:
-      sampleBasePropery:
+      sampleBaseProperty:
         type: string
   aNullableContainer:
     type: object
diff --git a/modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
index dac5c2a933a3..27e1524dab47 100644
--- a/modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
+++ b/modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
@@ -322,7 +322,7 @@ paths:
       tags:
         - store
       summary: Find purchase order by ID
-      description: 'For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions'
+      description: 'For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions'
       operationId: getOrderById
       produces:
         - application/xml
@@ -830,7 +830,7 @@ paths:
           description: Integer in group parameters
       responses:
         '400':
-          description: Someting wrong
+          description: Something wrong
   /fake/outer/number:
     post:
       tags:
diff --git a/modules/openapi-generator/src/test/resources/3_0/asciidoc/api-docs.json b/modules/openapi-generator/src/test/resources/3_0/asciidoc/api-docs.json
index 5c7b2ce7aebf..0ef296a8fb1a 100644
--- a/modules/openapi-generator/src/test/resources/3_0/asciidoc/api-docs.json
+++ b/modules/openapi-generator/src/test/resources/3_0/asciidoc/api-docs.json
@@ -1340,7 +1340,7 @@
                         "example": "tlead1"
                     }
                 },
-                "description": "a team member, could be project lead or an member with assigned tasks."
+                "description": "a team member, could be project lead or a member with assigned tasks."
             },
             "TaskWeek": {
                 "type": "object",
diff --git a/modules/openapi-generator/src/test/resources/3_0/aspnetcore/petstore.yaml b/modules/openapi-generator/src/test/resources/3_0/aspnetcore/petstore.yaml
index 183eccd90bb0..c0ca877d6f98 100644
--- a/modules/openapi-generator/src/test/resources/3_0/aspnetcore/petstore.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/aspnetcore/petstore.yaml
@@ -335,7 +335,7 @@ paths:
       summary: Find purchase order by ID
       description: >-
         For valid response try integer IDs with value <= 5 or > 10. Other values
-        will generated exceptions
+        will generate exceptions
       operationId: getOrderById
       parameters:
         - name: orderId
diff --git a/modules/openapi-generator/src/test/resources/3_0/avro-schema/petstore.yaml b/modules/openapi-generator/src/test/resources/3_0/avro-schema/petstore.yaml
index 89461f2c9755..65cc9bd313b1 100644
--- a/modules/openapi-generator/src/test/resources/3_0/avro-schema/petstore.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/avro-schema/petstore.yaml
@@ -335,7 +335,7 @@ paths:
       summary: Find purchase order by ID
       description: >-
         For valid response try integer IDs with value <= 5 or > 10. Other values
-        will generated exceptions
+        will generate exceptions
       operationId: getOrderById
       parameters:
         - name: orderId
diff --git a/modules/openapi-generator/src/test/resources/3_0/cpp-qt/petstore.yaml b/modules/openapi-generator/src/test/resources/3_0/cpp-qt/petstore.yaml
index bf8072432a3d..0d98a3be3c96 100644
--- a/modules/openapi-generator/src/test/resources/3_0/cpp-qt/petstore.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/cpp-qt/petstore.yaml
@@ -326,7 +326,7 @@ paths:
         - store
       summary: Find purchase order by ID
       description: For valid response try integer IDs with value <= 5 or > 10. Other values
-        will generated exceptions
+        will generate exceptions
       operationId: getOrderById
       parameters:
         - name: orderId
diff --git a/modules/openapi-generator/src/test/resources/3_0/crystal/petstore.yaml b/modules/openapi-generator/src/test/resources/3_0/crystal/petstore.yaml
index 002eaa2e8ef7..385b3e0e5e72 100644
--- a/modules/openapi-generator/src/test/resources/3_0/crystal/petstore.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/crystal/petstore.yaml
@@ -335,7 +335,7 @@ paths:
       summary: Find purchase order by ID
       description: >-
         For valid response try integer IDs with value <= 5 or > 10. Other values
-        will generated exceptions
+        will generate exceptions
       operationId: getOrderById
       parameters:
         - name: orderId
diff --git a/modules/openapi-generator/src/test/resources/3_0/csharp-netcore/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/modules/openapi-generator/src/test/resources/3_0/csharp-netcore/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
index afd5a8a62b7a..8f2b63eefe97 100644
--- a/modules/openapi-generator/src/test/resources/3_0/csharp-netcore/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/csharp-netcore/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
@@ -374,7 +374,7 @@ paths:
       summary: Find purchase order by ID
       description: >-
         For valid response try integer IDs with value <= 5 or > 10. Other values
-        will generated exceptions
+        will generate exceptions
       operationId: getOrderById
       parameters:
         - name: order_id
@@ -859,7 +859,7 @@ paths:
             format: int64
       responses:
         '400':
-          description: Someting wrong
+          description: Something wrong
   /fake/outer/number:
     post:
       tags:
diff --git a/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
index 7695348b2088..677a8ad31fb4 100644
--- a/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
@@ -337,7 +337,7 @@ paths:
       summary: Find purchase order by ID
       description: >-
         For valid response try integer IDs with value <= 5 or > 10. Other values
-        will generated exceptions
+        will generate exceptions
       operationId: getOrderById
       parameters:
         - name: order_id
@@ -822,7 +822,7 @@ paths:
             format: int64
       responses:
         '400':
-          description: Someting wrong
+          description: Something wrong
   /fake/outer/number:
     post:
       tags:
diff --git a/modules/openapi-generator/src/test/resources/3_0/elm.yaml b/modules/openapi-generator/src/test/resources/3_0/elm.yaml
index 13dde8a98392..162d9b976127 100644
--- a/modules/openapi-generator/src/test/resources/3_0/elm.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/elm.yaml
@@ -160,7 +160,7 @@ components:
             type: array
             items:
               type: string
-        arrayOfPrimitve:
+        arrayOfPrimitive:
           type: array
           items:
             $ref: "#/components/schemas/Primitive"
diff --git a/modules/openapi-generator/src/test/resources/3_0/go/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/modules/openapi-generator/src/test/resources/3_0/go/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
index 4c7ed5960e14..b9bfe5a8ff95 100644
--- a/modules/openapi-generator/src/test/resources/3_0/go/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/go/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
@@ -355,7 +355,7 @@ paths:
       summary: Find purchase order by ID
       description: >-
         For valid response try integer IDs with value <= 5 or > 10. Other values
-        will generated exceptions
+        will generate exceptions
       operationId: getOrderById
       parameters:
         - name: order_id
@@ -838,9 +838,9 @@ paths:
             format: int64
       responses:
         '400':
-          description: Someting wrong
+          description: Something wrong
         '5XX':
-          description: Someting wrong
+          description: Something wrong
           content:
             'applicatino/json':
               schema:
diff --git a/modules/openapi-generator/src/test/resources/3_0/helidon/petstore-for-testing.yaml b/modules/openapi-generator/src/test/resources/3_0/helidon/petstore-for-testing.yaml
index 4219f4004a23..aa139e062904 100644
--- a/modules/openapi-generator/src/test/resources/3_0/helidon/petstore-for-testing.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/helidon/petstore-for-testing.yaml
@@ -341,7 +341,7 @@ paths:
           multipart/form-data:
             schema:
               $ref: '#/components/schemas/PetsForm'
-        description: Object that that contains info about pets
+        description: Object that contains info about pets
         required: true
       responses:
         '200':
@@ -402,7 +402,7 @@ paths:
       summary: Find purchase order by ID
       description: >-
         For valid response try integer IDs with value <= 5 or > 10. Other values
-        will generated exceptions
+        will generate exceptions
       operationId: getOrderById
       parameters:
         - name: orderId
diff --git a/modules/openapi-generator/src/test/resources/3_0/helidon/petstore-no-multipart-for-testing.yaml b/modules/openapi-generator/src/test/resources/3_0/helidon/petstore-no-multipart-for-testing.yaml
index 3a10351b615f..012fecfb64d9 100644
--- a/modules/openapi-generator/src/test/resources/3_0/helidon/petstore-no-multipart-for-testing.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/helidon/petstore-no-multipart-for-testing.yaml
@@ -331,7 +331,7 @@ paths:
       summary: Find purchase order by ID
       description: >-
         For valid response try integer IDs with value <= 5 or > 10. Other values
-        will generated exceptions
+        will generate exceptions
       operationId: getOrderById
       parameters:
         - name: orderId
diff --git a/modules/openapi-generator/src/test/resources/3_0/inline_model_resolver.yaml b/modules/openapi-generator/src/test/resources/3_0/inline_model_resolver.yaml
index 0741d3b5d774..7f1d9bdd1dd7 100644
--- a/modules/openapi-generator/src/test/resources/3_0/inline_model_resolver.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/inline_model_resolver.yaml
@@ -293,7 +293,7 @@ paths:
                   type: object
   /empty_example_on_string_models:
     get:
-      operationId: emptyExampleoOnStringTypeModels
+      operationId: emptyExampleOnStringTypeModels
       responses:
         '200':
           description: OK
diff --git a/modules/openapi-generator/src/test/resources/3_0/issue_11772.yml b/modules/openapi-generator/src/test/resources/3_0/issue_11772.yml
index 98737ae11f86..7c1d941613f4 100644
--- a/modules/openapi-generator/src/test/resources/3_0/issue_11772.yml
+++ b/modules/openapi-generator/src/test/resources/3_0/issue_11772.yml
@@ -200,7 +200,7 @@ components:
           x-field-extra-annotation: |-
             @org.springframework.data.annotation.LastModifiedDate
         modifiedBy:
-          description: The employee id (Kerberos) of the user that last modifed the project.
+          description: The employee id (Kerberos) of the user that last modified the project.
           type: string
           example: janedoe
           x-field-extra-annotation: |-
diff --git a/modules/openapi-generator/src/test/resources/3_0/issue_13025.yaml b/modules/openapi-generator/src/test/resources/3_0/issue_13025.yaml
index 40cf1c1ed077..09e2f240cbb8 100644
--- a/modules/openapi-generator/src/test/resources/3_0/issue_13025.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/issue_13025.yaml
@@ -23,7 +23,7 @@ components:
           nullable: true
           items:
             type: string
-    BodyWithRequiredNullalble:
+    BodyWithRequiredNullable:
       type: object
       required:
       - arrayThatIsNull
diff --git a/modules/openapi-generator/src/test/resources/3_0/issue_3248.yaml b/modules/openapi-generator/src/test/resources/3_0/issue_3248.yaml
index 701447d9f675..19d32b47180e 100644
--- a/modules/openapi-generator/src/test/resources/3_0/issue_3248.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/issue_3248.yaml
@@ -23,9 +23,9 @@ paths:
           schema:
             type: string
             format: date
-  /girafes:
+  /giraffes:
     get:
-      operationId: getGirafes
+      operationId: getGiraffes
       parameters:
         - $ref: '#/components/parameters/refStatus'
   /zebras:
diff --git a/modules/openapi-generator/src/test/resources/3_0/issue_5381.yaml b/modules/openapi-generator/src/test/resources/3_0/issue_5381.yaml
index 192c958f7245..d37c8a79fba0 100644
--- a/modules/openapi-generator/src/test/resources/3_0/issue_5381.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/issue_5381.yaml
@@ -61,7 +61,7 @@ components:
         id:
           type: string
           description: unique identifier
-      description: Base schema for adressable entities
+      description: Base schema for addressable entities
     Extensible:
       type: object
       properties:
diff --git a/modules/openapi-generator/src/test/resources/3_0/issue_6762.yaml b/modules/openapi-generator/src/test/resources/3_0/issue_6762.yaml
index 9df77efc7f95..c14a34b39af2 100644
--- a/modules/openapi-generator/src/test/resources/3_0/issue_6762.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/issue_6762.yaml
@@ -8,9 +8,9 @@ info:
     name: Apache-2.0
     url: 'https://www.apache.org/licenses/LICENSE-2.0.html'
 paths:
-  /girafes/{refStatus}:
+  /giraffes/{refStatus}:
     get:
-      operationId: getGirafes
+      operationId: getGiraffes
       parameters:
         - $ref: '#/components/parameters/refStatus'
   /zebras/{status}:
diff --git a/modules/openapi-generator/src/test/resources/3_0/issue_7361.yaml b/modules/openapi-generator/src/test/resources/3_0/issue_7361.yaml
index 778a7f451fea..93cdc902ec72 100644
--- a/modules/openapi-generator/src/test/resources/3_0/issue_7361.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/issue_7361.yaml
@@ -11,7 +11,7 @@ paths: {}
 components:
   schemas:
     FreeForm:
-      description: this will not be generated because a map will be used when othe components or endpoints ref this schema
+      description: this will not be generated because a map will be used when other components or endpoints ref this schema
       type: object
     FreeFormInterface:
       type: object
diff --git a/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature-okhttp-gson.yaml b/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature-okhttp-gson.yaml
index f0f4fa1da3ad..2e4c21702045 100644
--- a/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature-okhttp-gson.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature-okhttp-gson.yaml
@@ -337,7 +337,7 @@ paths:
       summary: Find purchase order by ID
       description: >-
         For valid response try integer IDs with value <= 5 or > 10. Other values
-        will generated exceptions
+        will generate exceptions
       operationId: getOrderById
       parameters:
         - name: order_id
@@ -822,7 +822,7 @@ paths:
             format: int64
       responses:
         '400':
-          description: Someting wrong
+          description: Something wrong
   /fake/outer/number:
     post:
       tags:
diff --git a/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
index 455a11dbe596..7c0f833e2f92 100644
--- a/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
@@ -337,7 +337,7 @@ paths:
       summary: Find purchase order by ID
       description: >-
         For valid response try integer IDs with value <= 5 or > 10. Other values
-        will generated exceptions
+        will generate exceptions
       operationId: getOrderById
       parameters:
         - name: order_id
@@ -822,7 +822,7 @@ paths:
             format: int64
       responses:
         '400':
-          description: Someting wrong
+          description: Something wrong
   /fake/outer/number:
     post:
       tags:
diff --git a/modules/openapi-generator/src/test/resources/3_0/javascript/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/3_0/javascript/petstore-with-fake-endpoints-models-for-testing.yaml
index fadeb02edb7c..cac52823a43f 100644
--- a/modules/openapi-generator/src/test/resources/3_0/javascript/petstore-with-fake-endpoints-models-for-testing.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/javascript/petstore-with-fake-endpoints-models-for-testing.yaml
@@ -348,7 +348,7 @@ paths:
       summary: Find purchase order by ID
       description: >-
         For valid response try integer IDs with value <= 5 or > 10. Other values
-        will generated exceptions
+        will generate exceptions
       operationId: getOrderById
       parameters:
         - name: order_id
@@ -837,7 +837,7 @@ paths:
             format: int64
       responses:
         '400':
-          description: Someting wrong
+          description: Something wrong
   /fake/outer/number:
     post:
       tags:
diff --git a/modules/openapi-generator/src/test/resources/3_0/kotlin/reserved_words.yaml b/modules/openapi-generator/src/test/resources/3_0/kotlin/reserved_words.yaml
index d5074fd953c9..540607bb157c 100644
--- a/modules/openapi-generator/src/test/resources/3_0/kotlin/reserved_words.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/kotlin/reserved_words.yaml
@@ -214,7 +214,7 @@ components:
           $ref: '#/components/schemas/Linked'
 
     Linked:
-      description: Refernce links
+      description: Reference links
       type: object
       properties:
         as:
diff --git a/modules/openapi-generator/src/test/resources/3_0/mapSchemas.yaml b/modules/openapi-generator/src/test/resources/3_0/mapSchemas.yaml
index b57ee87455d3..61338df89549 100644
--- a/modules/openapi-generator/src/test/resources/3_0/mapSchemas.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/mapSchemas.yaml
@@ -27,7 +27,7 @@ components:
       properties:
         id:
           type: string
-        withAdditinalProperties:
+        withAdditionalProperties:
           $ref: '#/components/schemas/ModelWithAdditionalProperties'
     ModelWithAdditionalProperties:
       type: object
diff --git a/modules/openapi-generator/src/test/resources/3_0/micronaut/roles-extension-test.yaml b/modules/openapi-generator/src/test/resources/3_0/micronaut/roles-extension-test.yaml
index 1fa23eb9f626..8ec596652ad0 100644
--- a/modules/openapi-generator/src/test/resources/3_0/micronaut/roles-extension-test.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/micronaut/roles-extension-test.yaml
@@ -8,7 +8,7 @@ info:
     url: 'https://www.apache.org/licenses/LICENSE-2.0.html'
 tags:
   - {name: books, description: Everything about books}
-  - {name: users, description: Everyting about users}
+  - {name: users, description: Everything about users}
   - {name: reviews, description: Everything related to book reviews}
 paths:
   /book/{bookName}:
diff --git a/modules/openapi-generator/src/test/resources/3_0/oneof_polymorphism_and_inheritance.yaml b/modules/openapi-generator/src/test/resources/3_0/oneof_polymorphism_and_inheritance.yaml
index dc916b1ee21e..b3f6990de5c2 100644
--- a/modules/openapi-generator/src/test/resources/3_0/oneof_polymorphism_and_inheritance.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/oneof_polymorphism_and_inheritance.yaml
@@ -60,7 +60,7 @@ components:
         id:
           type: string
           description: unique identifier
-      description: Base schema for adressable entities
+      description: Base schema for addressable entities
     Extensible:
       type: object
       properties:
diff --git a/modules/openapi-generator/src/test/resources/3_0/petstore-with-complex-headers.yaml b/modules/openapi-generator/src/test/resources/3_0/petstore-with-complex-headers.yaml
index daf9e82cf1d9..2b8d0a7f5f83 100644
--- a/modules/openapi-generator/src/test/resources/3_0/petstore-with-complex-headers.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/petstore-with-complex-headers.yaml
@@ -333,7 +333,7 @@ paths:
       summary: Find purchase order by ID
       description: >-
         For valid response try integer IDs with value <= 5 or > 10. Other values
-        will generated exceptions
+        will generate exceptions
       operationId: getOrderById
       parameters:
         - name: orderId
diff --git a/modules/openapi-generator/src/test/resources/3_0/petstore-with-depreacted-fields.yaml b/modules/openapi-generator/src/test/resources/3_0/petstore-with-deprecated-fields.yaml
similarity index 99%
rename from modules/openapi-generator/src/test/resources/3_0/petstore-with-depreacted-fields.yaml
rename to modules/openapi-generator/src/test/resources/3_0/petstore-with-deprecated-fields.yaml
index b88deaac3ee1..0cc32cc1ad45 100644
--- a/modules/openapi-generator/src/test/resources/3_0/petstore-with-depreacted-fields.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/petstore-with-deprecated-fields.yaml
@@ -316,7 +316,7 @@ paths:
       summary: Find purchase order by ID
       description: >-
         For valid response try integer IDs with value <= 5 or > 10. Other values
-        will generated exceptions
+        will generate exceptions
       operationId: getOrderById
       parameters:
         - name: orderId
diff --git a/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
index 31b34ae4e198..68c92decbc3a 100644
--- a/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
@@ -355,7 +355,7 @@ paths:
       summary: Find purchase order by ID
       description: >-
         For valid response try integer IDs with value <= 5 or > 10. Other values
-        will generated exceptions
+        will generate exceptions
       operationId: getOrderById
       parameters:
         - name: order_id
@@ -838,7 +838,7 @@ paths:
             format: int64
       responses:
         '400':
-          description: Someting wrong
+          description: Something wrong
   /fake/outer/number:
     post:
       tags:
diff --git a/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
index 4ff880612223..2401e56127f4 100644
--- a/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
@@ -363,7 +363,7 @@ paths:
       summary: Find purchase order by ID
       description: >-
         For valid response try integer IDs with value <= 5 or > 10. Other values
-        will generated exceptions
+        will generate exceptions
       operationId: getOrderById
       parameters:
         - name: order_id
@@ -852,7 +852,7 @@ paths:
             format: int64
       responses:
         '400':
-          description: Someting wrong
+          description: Something wrong
   /fake/outer/number:
     post:
       tags:
diff --git a/modules/openapi-generator/src/test/resources/3_0/petstore-with-nullable-required.yaml b/modules/openapi-generator/src/test/resources/3_0/petstore-with-nullable-required.yaml
index e0471993d5da..9196cafcafe4 100644
--- a/modules/openapi-generator/src/test/resources/3_0/petstore-with-nullable-required.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/petstore-with-nullable-required.yaml
@@ -316,7 +316,7 @@ paths:
       summary: Find purchase order by ID
       description: >-
         For valid response try integer IDs with value <= 5 or > 10. Other values
-        will generated exceptions
+        will generate exceptions
       operationId: getOrderById
       parameters:
         - name: orderId
diff --git a/modules/openapi-generator/src/test/resources/3_0/petstore-with-object-as-parameter.yaml b/modules/openapi-generator/src/test/resources/3_0/petstore-with-object-as-parameter.yaml
index 86e397c820b1..5020c07cede2 100644
--- a/modules/openapi-generator/src/test/resources/3_0/petstore-with-object-as-parameter.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/petstore-with-object-as-parameter.yaml
@@ -324,7 +324,7 @@ paths:
       summary: Find purchase order by ID
       description: >-
         For valid response try integer IDs with value <= 5 or > 10. Other values
-        will generated exceptions
+        will generate exceptions
       operationId: getOrderById
       parameters:
         - name: orderId
diff --git a/modules/openapi-generator/src/test/resources/3_0/petstore.json b/modules/openapi-generator/src/test/resources/3_0/petstore.json
index 1873cd6516f0..7d07119f535f 100644
--- a/modules/openapi-generator/src/test/resources/3_0/petstore.json
+++ b/modules/openapi-generator/src/test/resources/3_0/petstore.json
@@ -497,7 +497,7 @@
           "store"
         ],
         "summary": "Find purchase order by ID",
-        "description": "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        "description": "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         "operationId": "getOrderById",
         "parameters": [
           {
diff --git a/modules/openapi-generator/src/test/resources/3_0/petstore.yaml b/modules/openapi-generator/src/test/resources/3_0/petstore.yaml
index 9184e9c80644..0971c554414a 100644
--- a/modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/petstore.yaml
@@ -335,7 +335,7 @@ paths:
       summary: Find purchase order by ID
       description: >-
         For valid response try integer IDs with value <= 5 or > 10. Other values
-        will generated exceptions
+        will generate exceptions
       operationId: getOrderById
       parameters:
         - name: orderId
diff --git a/modules/openapi-generator/src/test/resources/3_0/petstore_oas3_test.yaml b/modules/openapi-generator/src/test/resources/3_0/petstore_oas3_test.yaml
index d57fd4e4f087..0b4c9927c36b 100644
--- a/modules/openapi-generator/src/test/resources/3_0/petstore_oas3_test.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/petstore_oas3_test.yaml
@@ -319,7 +319,7 @@ paths:
       summary: Find purchase order by ID
       description: >-
         For valid response try integer IDs with value <= 5 or > 10. Other values
-        will generated exceptions
+        will generate exceptions
       operationId: getOrderById
       parameters:
         - name: orderId
diff --git a/modules/openapi-generator/src/test/resources/3_0/powershell/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/modules/openapi-generator/src/test/resources/3_0/powershell/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
index a2e2981e6960..50056d0d050c 100644
--- a/modules/openapi-generator/src/test/resources/3_0/powershell/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/powershell/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
@@ -338,7 +338,7 @@ paths:
       summary: Find purchase order by ID
       description: >-
         For valid response try integer IDs with value <= 5 or > 10. Other values
-        will generated exceptions
+        will generate exceptions
       operationId: getOrderById
       parameters:
         - name: order_id
@@ -823,7 +823,7 @@ paths:
             format: int64
       responses:
         '400':
-          description: Someting wrong
+          description: Something wrong
   /fake/outer/number:
     post:
       tags:
diff --git a/modules/openapi-generator/src/test/resources/3_0/powershell/petstore.yaml b/modules/openapi-generator/src/test/resources/3_0/powershell/petstore.yaml
index 025d072c7630..8f1ab1c858b2 100644
--- a/modules/openapi-generator/src/test/resources/3_0/powershell/petstore.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/powershell/petstore.yaml
@@ -356,7 +356,7 @@ paths:
       summary: Find purchase order by ID
       description: >-
         For valid response try integer IDs with value <= 5 or > 10. Other values
-        will generated exceptions
+        will generate exceptions
       operationId: getOrderById
       parameters:
         - name: orderId
diff --git a/modules/openapi-generator/src/test/resources/3_0/protobuf/petstore.yaml b/modules/openapi-generator/src/test/resources/3_0/protobuf/petstore.yaml
index 3db600f31eb6..67a1d25efb66 100644
--- a/modules/openapi-generator/src/test/resources/3_0/protobuf/petstore.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/protobuf/petstore.yaml
@@ -335,7 +335,7 @@ paths:
       summary: Find purchase order by ID
       description: >-
         For valid response try integer IDs with value <= 5 or > 10. Other values
-        will generated exceptions
+        will generate exceptions
       operationId: getOrderById
       parameters:
         - name: orderId
diff --git a/modules/openapi-generator/src/test/resources/3_0/python-prior/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/modules/openapi-generator/src/test/resources/3_0/python-prior/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
index 8d040105b98d..d6b0336a7535 100644
--- a/modules/openapi-generator/src/test/resources/3_0/python-prior/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/python-prior/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
@@ -300,7 +300,7 @@ paths:
       summary: Find purchase order by ID
       description: >-
         For valid response try integer IDs with value <= 5 or > 10. Other values
-        will generated exceptions
+        will generate exceptions
       operationId: getOrderById
       parameters:
         - name: order_id
@@ -787,7 +787,7 @@ paths:
             format: int64
       responses:
         '400':
-          description: Someting wrong
+          description: Something wrong
   /fake/refs/number:
     post:
       tags:
@@ -2290,7 +2290,7 @@ components:
         - $ref: '#/components/schemas/banana'
     fruitReq:
       description: a schema where additionalProperties is on in the composed schema and off in the oneOf object schemas
-        also, this schem accepts null as a value
+        also, this scheme accepts null as a value
       oneOf:
         - type: 'null'
         - $ref: '#/components/schemas/appleReq'
diff --git a/modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
index f6c3f327b188..e5b0be963300 100644
--- a/modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
@@ -338,7 +338,7 @@ paths:
       summary: Find purchase order by ID
       description: >-
         For valid response try integer IDs with value <= 5 or > 10. Other values
-        will generated exceptions
+        will generate exceptions
       operationId: getOrderById
       parameters:
         - name: order_id
@@ -1130,7 +1130,7 @@ paths:
     put:
       tags:
         - fake
-      description: Ensures that original naming is used in endpoint params, that way we on't have collisions
+      description: Ensures that original naming is used in endpoint params, that way we won't have collisions
       operationId: CaseSensitiveParams
       parameters:
         - name: someVar
@@ -1151,7 +1151,7 @@ paths:
       responses:
         "200":
           description: Success
-  /fake/test-query-paramters:
+  /fake/test-query-parameters:
     put:
       tags:
         - fake
diff --git a/modules/openapi-generator/src/test/resources/3_0/r/petstore.yaml b/modules/openapi-generator/src/test/resources/3_0/r/petstore.yaml
index 86ef6839356c..fcddaaa8d608 100644
--- a/modules/openapi-generator/src/test/resources/3_0/r/petstore.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/r/petstore.yaml
@@ -398,7 +398,7 @@ paths:
       summary: Find purchase order by ID
       description: >-
         For valid response try integer IDs with value <= 5 or > 10. Other values
-        will generated exceptions
+        will generate exceptions
       operationId: getOrderById
       parameters:
         - name: orderId
diff --git a/modules/openapi-generator/src/test/resources/3_0/response-tests.yaml b/modules/openapi-generator/src/test/resources/3_0/response-tests.yaml
index e17881606db7..768bd2f8e8fd 100644
--- a/modules/openapi-generator/src/test/resources/3_0/response-tests.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/response-tests.yaml
@@ -300,7 +300,7 @@ paths:
       summary: Find purchase order by ID
       description: >-
         For valid response try integer IDs with value <= 5 or > 10. Other values
-        will generated exceptions
+        will generate exceptions
       operationId: getOrderById
       parameters:
         - name: orderId
diff --git a/modules/openapi-generator/src/test/resources/3_0/rust-server/no-example-v3.yaml b/modules/openapi-generator/src/test/resources/3_0/rust-server/no-example-v3.yaml
index 8c9e737c1ed7..cd9585a9db50 100644
--- a/modules/openapi-generator/src/test/resources/3_0/rust-server/no-example-v3.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/rust-server/no-example-v3.yaml
@@ -14,7 +14,7 @@ paths:
             schema:
               type: object
               properties:
-                propery:
+                property:
                   type: string
               required:
                 - property
diff --git a/modules/openapi-generator/src/test/resources/3_0/rust/petstore.yaml b/modules/openapi-generator/src/test/resources/3_0/rust/petstore.yaml
index 0c09dee9414c..e72f1e21e95b 100644
--- a/modules/openapi-generator/src/test/resources/3_0/rust/petstore.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/rust/petstore.yaml
@@ -335,7 +335,7 @@ paths:
       summary: Find purchase order by ID
       description: >-
         For valid response try integer IDs with value <= 5 or > 10. Other values
-        will generated exceptions
+        will generate exceptions
       operationId: getOrderById
       parameters:
         - name: orderId
diff --git a/modules/openapi-generator/src/test/resources/3_0/scala-akka/petstore.yaml b/modules/openapi-generator/src/test/resources/3_0/scala-akka/petstore.yaml
index 1b354403e94e..261eafdaac24 100644
--- a/modules/openapi-generator/src/test/resources/3_0/scala-akka/petstore.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/scala-akka/petstore.yaml
@@ -336,7 +336,7 @@ paths:
       summary: Find purchase order by ID
       description: >-
         For valid response try integer IDs with value <= 5 or > 10. Other values
-        will generated exceptions
+        will generate exceptions
       operationId: getOrderById
       parameters:
         - name: orderId
diff --git a/modules/openapi-generator/src/test/resources/3_0/scala/petstore.yaml b/modules/openapi-generator/src/test/resources/3_0/scala/petstore.yaml
index 7087e8c5d36a..2f62e97a375d 100644
--- a/modules/openapi-generator/src/test/resources/3_0/scala/petstore.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/scala/petstore.yaml
@@ -335,7 +335,7 @@ paths:
       summary: Find purchase order by ID
       description: >-
         For valid response try integer IDs with value <= 5 or > 10. Other values
-        will generated exceptions
+        will generate exceptions
       operationId: getOrderById
       parameters:
         - name: orderId
diff --git a/modules/openapi-generator/src/test/resources/3_0/schema-unalias-test.yml b/modules/openapi-generator/src/test/resources/3_0/schema-unalias-test.yml
index ea757d8f08fb..f802e344717d 100644
--- a/modules/openapi-generator/src/test/resources/3_0/schema-unalias-test.yml
+++ b/modules/openapi-generator/src/test/resources/3_0/schema-unalias-test.yml
@@ -37,7 +37,7 @@ components:
       properties:
         visitDate:
           default: 1971-12-19T03:39:57-08:00
-          description: Updated last vist timestamp
+          description: Updated last visit timestamp
           format: date-time
           type: string
       type: object
diff --git a/modules/openapi-generator/src/test/resources/3_0/server-required.yaml b/modules/openapi-generator/src/test/resources/3_0/server-required.yaml
index b6458d3da14a..33dd9ce64b3f 100644
--- a/modules/openapi-generator/src/test/resources/3_0/server-required.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/server-required.yaml
@@ -334,7 +334,7 @@ paths:
       summary: Find purchase order by ID
       description: >-
         For valid response try integer IDs with value <= 5 or > 10. Other values
-        will generated exceptions
+        will generate exceptions
       operationId: getOrderById
       parameters:
         - name: orderId
diff --git a/modules/openapi-generator/src/test/resources/3_0/spring/date-time-parameter-types-for-testing.yml b/modules/openapi-generator/src/test/resources/3_0/spring/date-time-parameter-types-for-testing.yml
index f3568d0c3ee4..535d152fc96e 100644
--- a/modules/openapi-generator/src/test/resources/3_0/spring/date-time-parameter-types-for-testing.yml
+++ b/modules/openapi-generator/src/test/resources/3_0/spring/date-time-parameter-types-for-testing.yml
@@ -28,7 +28,7 @@ paths:
               type: object
               properties:
                 visitDate:
-                  description: Updated last vist timestamp
+                  description: Updated last visit timestamp
                   type: string
                   default: '1971-12-19T03:39:57-08:00'
                   format: date-time
diff --git a/modules/openapi-generator/src/test/resources/3_0/unit_test_spec/3_0_3_unit_test_spec.yaml b/modules/openapi-generator/src/test/resources/3_0/unit_test_spec/3_0_3_unit_test_spec.yaml
index 053751510ff7..8d4632ac9764 100644
--- a/modules/openapi-generator/src/test/resources/3_0/unit_test_spec/3_0_3_unit_test_spec.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/unit_test_spec/3_0_3_unit_test_spec.yaml
@@ -4659,7 +4659,7 @@ components:
           foo: []
           bar: {}
         valid: false
-      DoesnTInvalidateOtherProperties:
+      DoesntInvalidateOtherProperties:
         description: doesn't invalidate other properties
         data:
           quux: []
diff --git a/modules/openapi-generator/src/test/resources/3_0/wsdl/petstore.yaml b/modules/openapi-generator/src/test/resources/3_0/wsdl/petstore.yaml
index deb33e89a36b..85482061ee3d 100644
--- a/modules/openapi-generator/src/test/resources/3_0/wsdl/petstore.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/wsdl/petstore.yaml
@@ -353,7 +353,7 @@ paths:
       - store
       summary: Find purchase order by ID
       description: For valid response try integer IDs with value >= 1 and <= 10.         Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - name: orderId
diff --git a/modules/openapi-generator/src/test/resources/3_1/petstore.yaml b/modules/openapi-generator/src/test/resources/3_1/petstore.yaml
index 6e83b7fdc24e..6c6de61d69bf 100644
--- a/modules/openapi-generator/src/test/resources/3_1/petstore.yaml
+++ b/modules/openapi-generator/src/test/resources/3_1/petstore.yaml
@@ -335,7 +335,7 @@ paths:
       summary: Find purchase order by ID
       description: >-
         For valid response try integer IDs with value <= 5 or > 10. Other values
-        will generated exceptions
+        will generate exceptions
       operationId: getOrderById
       parameters:
         - name: orderId
diff --git a/modules/openapi-generator/src/test/resources/integrationtests/typescript/node-es5-expected/api.ts b/modules/openapi-generator/src/test/resources/integrationtests/typescript/node-es5-expected/api.ts
index 76bf4cba40a0..b1217b60710a 100644
--- a/modules/openapi-generator/src/test/resources/integrationtests/typescript/node-es5-expected/api.ts
+++ b/modules/openapi-generator/src/test/resources/integrationtests/typescript/node-es5-expected/api.ts
@@ -537,7 +537,7 @@ export class StoreApi {
     }
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      */
     public getOrderById (orderId: string) : Promise<{ response: http.IncomingMessage; body: Order;  }> {
diff --git a/modules/openapi-generator/src/test/resources/integrationtests/typescript/node-es5-spec.json b/modules/openapi-generator/src/test/resources/integrationtests/typescript/node-es5-spec.json
index 12fde32b7684..56cc763e463e 100644
--- a/modules/openapi-generator/src/test/resources/integrationtests/typescript/node-es5-spec.json
+++ b/modules/openapi-generator/src/test/resources/integrationtests/typescript/node-es5-spec.json
@@ -318,7 +318,7 @@
           "store"
         ],
         "summary": "Find purchase order by ID",
-        "description": "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        "description": "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         "operationId": "getOrderById",
         "produces": [
           "application/json",
diff --git a/modules/openapi-generator/src/test/resources/integrationtests/typescript/petstore-expected/api/store.service.ts b/modules/openapi-generator/src/test/resources/integrationtests/typescript/petstore-expected/api/store.service.ts
index 374f8f02e751..e6256586bf9d 100644
--- a/modules/openapi-generator/src/test/resources/integrationtests/typescript/petstore-expected/api/store.service.ts
+++ b/modules/openapi-generator/src/test/resources/integrationtests/typescript/petstore-expected/api/store.service.ts
@@ -213,7 +213,7 @@ export class StoreService {
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
diff --git a/modules/openapi-generator/src/test/resources/integrationtests/typescript/petstore-spec.json b/modules/openapi-generator/src/test/resources/integrationtests/typescript/petstore-spec.json
index 2120a1a2f4ef..2276e57c1f8c 100644
--- a/modules/openapi-generator/src/test/resources/integrationtests/typescript/petstore-spec.json
+++ b/modules/openapi-generator/src/test/resources/integrationtests/typescript/petstore-spec.json
@@ -486,7 +486,7 @@
                     "store"
                 ],
                 "summary": "Find purchase order by ID",
-                "description": "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+                "description": "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
                 "operationId": "getOrderById",
                 "produces": [
                     "application/xml",
diff --git a/modules/openapi-generator/src/test/resources/petstore.json b/modules/openapi-generator/src/test/resources/petstore.json
index 1af2d2ae3eed..ad5523181b6a 100644
--- a/modules/openapi-generator/src/test/resources/petstore.json
+++ b/modules/openapi-generator/src/test/resources/petstore.json
@@ -471,7 +471,7 @@
           "store"
         ],
         "summary": "Find purchase order by ID",
-        "description": "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        "description": "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         "operationId": "getOrderById",
         "produces": [
           "application/json",
diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/RequestOptions.cs
index 7f440630dd5a..9b17590f1293 100644
--- a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/RequestOptions.cs
+++ b/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/RequestOptions.cs
@@ -33,7 +33,7 @@ public class RequestOptions
         public Multimap QueryParameters { get; set; }
 
         /// 
-        /// Header parameters to be applied to to the request.
+        /// Header parameters to be applied to the request.
         /// Keys may have 1 or more values associated.
         /// 
         public Multimap HeaderParameters { get; set; }
diff --git a/samples/client/petstore/R-httr2-wrapper/.openapi-generator-ignore b/samples/client/petstore/R-httr2-wrapper/.openapi-generator-ignore
index c5fa491b4c55..deed424f8a15 100644
--- a/samples/client/petstore/R-httr2-wrapper/.openapi-generator-ignore
+++ b/samples/client/petstore/R-httr2-wrapper/.openapi-generator-ignore
@@ -5,7 +5,7 @@
 # The patterns follow closely to .gitignore or .dockerignore.
 
 # As an example, the C# client generator defines ApiClient.cs.
-# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+# You can make changes and tell Swagger Codegen to ignore just this file by uncommenting the following line:
 #ApiClient.cs
 
 # You can match any string of characters against a directory, file or extension with a single asterisk (*):
diff --git a/samples/client/petstore/R-httr2-wrapper/R/allof_tag_api_response.R b/samples/client/petstore/R-httr2-wrapper/R/allof_tag_api_response.R
index 220d89ee5036..7cfd85917e92 100644
--- a/samples/client/petstore/R-httr2-wrapper/R/allof_tag_api_response.R
+++ b/samples/client/petstore/R-httr2-wrapper/R/allof_tag_api_response.R
@@ -37,7 +37,7 @@ AllofTagApiResponse <- R6::R6Class(
     #' @param code code
     #' @param type type
     #' @param message message
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`id` = NULL, `name` = NULL, `code` = NULL, `type` = NULL, `message` = NULL, additional_properties = NULL, ...) {
@@ -286,7 +286,7 @@ AllofTagApiResponse <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # AllofTagApiResponse$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # AllofTagApiResponse$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2-wrapper/R/animal.R b/samples/client/petstore/R-httr2-wrapper/R/animal.R
index b506bced42f9..a1689f8394fd 100644
--- a/samples/client/petstore/R-httr2-wrapper/R/animal.R
+++ b/samples/client/petstore/R-httr2-wrapper/R/animal.R
@@ -30,7 +30,7 @@ Animal <- R6::R6Class(
     #'
     #' @param className className
     #' @param color color. Default to "red".
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`className`, `color` = "red", additional_properties = NULL, ...) {
@@ -231,7 +231,7 @@ Animal <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # Animal$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # Animal$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2-wrapper/R/any_of_pig.R b/samples/client/petstore/R-httr2-wrapper/R/any_of_pig.R
index 64e859d560bc..34736dc7f38c 100644
--- a/samples/client/petstore/R-httr2-wrapper/R/any_of_pig.R
+++ b/samples/client/petstore/R-httr2-wrapper/R/any_of_pig.R
@@ -174,7 +174,7 @@ AnyOfPig <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 #AnyOfPig$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 #AnyOfPig$set("public", "print", function(...) {
 #  print(jsonlite::prettify(self$toJSONString()))
 #  invisible(self)
diff --git a/samples/client/petstore/R-httr2-wrapper/R/any_of_primitive_type_test.R b/samples/client/petstore/R-httr2-wrapper/R/any_of_primitive_type_test.R
index da1e53ce4729..c34326a3161f 100644
--- a/samples/client/petstore/R-httr2-wrapper/R/any_of_primitive_type_test.R
+++ b/samples/client/petstore/R-httr2-wrapper/R/any_of_primitive_type_test.R
@@ -193,7 +193,7 @@ AnyOfPrimitiveTypeTest <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 #AnyOfPrimitiveTypeTest$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 #AnyOfPrimitiveTypeTest$set("public", "print", function(...) {
 #  print(jsonlite::prettify(self$toJSONString()))
 #  invisible(self)
diff --git a/samples/client/petstore/R-httr2-wrapper/R/api_client.R b/samples/client/petstore/R-httr2-wrapper/R/api_client.R
index 3ca3cf9ce7f4..5ad09ce50e02 100644
--- a/samples/client/petstore/R-httr2-wrapper/R/api_client.R
+++ b/samples/client/petstore/R-httr2-wrapper/R/api_client.R
@@ -163,7 +163,7 @@ ApiClient  <- R6::R6Class(
     #' @param header_params The header parameters.
     #' @param form_params The form parameters.
     #' @param file_params The form parameters to upload files.
-    #' @param accepts The HTTP accpet headers.
+    #' @param accepts The HTTP accept headers.
     #' @param content_types The HTTP content-type headers.
     #' @param body The HTTP request body.
     #' @param is_oauth True if the endpoints required OAuth authentication.
@@ -194,7 +194,7 @@ ApiClient  <- R6::R6Class(
     #' @param header_params The header parameters.
     #' @param form_params The form parameters.
     #' @param file_params The form parameters for uploading files.
-    #' @param accepts The HTTP accpet headers.
+    #' @param accepts The HTTP accept headers.
     #' @param content_types The HTTP content-type headers.
     #' @param body The HTTP request body.
     #' @param is_oauth True if the endpoints required OAuth authentication.
@@ -405,10 +405,10 @@ ApiClient  <- R6::R6Class(
       }
       return_obj
     },
-    #' Return a propery header (for accept or content-type).
+    #' Return a property header (for accept or content-type).
     #'
     #' @description
-    #' Return a propery header (for accept or content-type). If JSON-related MIME is found,
+    #' Return a property header (for accept or content-type). If JSON-related MIME is found,
     #' return it. Otherwise, return the first one, if any.
     #'
     #' @param headers A list of headers
diff --git a/samples/client/petstore/R-httr2-wrapper/R/api_response.R b/samples/client/petstore/R-httr2-wrapper/R/api_response.R
index 70431ae7e582..6cff851aed42 100644
--- a/samples/client/petstore/R-httr2-wrapper/R/api_response.R
+++ b/samples/client/petstore/R-httr2-wrapper/R/api_response.R
@@ -12,7 +12,7 @@
 #' @field content The deserialized response body.
 #' @field response The raw response from the endpoint.
 #' @field status_code The HTTP response status code.
-#' @field status_code_desc The brief descriptoin of the HTTP response status code.
+#' @field status_code_desc The brief description of the HTTP response status code.
 #' @field headers The HTTP response headers.
 #' @export
 ApiResponse <- R6::R6Class(
diff --git a/samples/client/petstore/R-httr2-wrapper/R/basque_pig.R b/samples/client/petstore/R-httr2-wrapper/R/basque_pig.R
index ac83042c8cfd..048bff78e75c 100644
--- a/samples/client/petstore/R-httr2-wrapper/R/basque_pig.R
+++ b/samples/client/petstore/R-httr2-wrapper/R/basque_pig.R
@@ -28,7 +28,7 @@ BasquePig <- R6::R6Class(
     #'
     #' @param className className
     #' @param color color
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`className`, `color`, additional_properties = NULL, ...) {
@@ -247,7 +247,7 @@ BasquePig <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # BasquePig$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # BasquePig$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2-wrapper/R/cat.R b/samples/client/petstore/R-httr2-wrapper/R/cat.R
index f74e2d887ddd..9198500c01a2 100644
--- a/samples/client/petstore/R-httr2-wrapper/R/cat.R
+++ b/samples/client/petstore/R-httr2-wrapper/R/cat.R
@@ -32,7 +32,7 @@ Cat <- R6::R6Class(
     #' @param className className
     #' @param color color. Default to "red".
     #' @param declawed declawed
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`className`, `color` = "red", `declawed` = NULL, additional_properties = NULL, ...) {
@@ -255,7 +255,7 @@ Cat <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # Cat$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # Cat$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2-wrapper/R/cat_all_of.R b/samples/client/petstore/R-httr2-wrapper/R/cat_all_of.R
index 197e1a46e3a5..d25992a78780 100644
--- a/samples/client/petstore/R-httr2-wrapper/R/cat_all_of.R
+++ b/samples/client/petstore/R-httr2-wrapper/R/cat_all_of.R
@@ -25,7 +25,7 @@ CatAllOf <- R6::R6Class(
     #' Initialize a new CatAllOf class.
     #'
     #' @param declawed declawed
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`declawed` = NULL, additional_properties = NULL, ...) {
@@ -186,7 +186,7 @@ CatAllOf <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # CatAllOf$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # CatAllOf$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2-wrapper/R/category.R b/samples/client/petstore/R-httr2-wrapper/R/category.R
index 2646d01bd723..175b3cbb9aeb 100644
--- a/samples/client/petstore/R-httr2-wrapper/R/category.R
+++ b/samples/client/petstore/R-httr2-wrapper/R/category.R
@@ -28,7 +28,7 @@ Category <- R6::R6Class(
     #'
     #' @param id id
     #' @param name name
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`id` = NULL, `name` = NULL, additional_properties = NULL, ...) {
@@ -219,7 +219,7 @@ Category <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # Category$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # Category$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2-wrapper/R/danish_pig.R b/samples/client/petstore/R-httr2-wrapper/R/danish_pig.R
index 06cf5096a889..627bd413163e 100644
--- a/samples/client/petstore/R-httr2-wrapper/R/danish_pig.R
+++ b/samples/client/petstore/R-httr2-wrapper/R/danish_pig.R
@@ -28,7 +28,7 @@ DanishPig <- R6::R6Class(
     #'
     #' @param className className
     #' @param size size
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`className`, `size`, additional_properties = NULL, ...) {
@@ -247,7 +247,7 @@ DanishPig <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # DanishPig$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # DanishPig$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2-wrapper/R/date.R b/samples/client/petstore/R-httr2-wrapper/R/date.R
index 79945bc8cfcf..3299b6658ad1 100644
--- a/samples/client/petstore/R-httr2-wrapper/R/date.R
+++ b/samples/client/petstore/R-httr2-wrapper/R/date.R
@@ -31,7 +31,7 @@ Date <- R6::R6Class(
     #' @param className className
     #' @param url_property url_property
     #' @param percent_description using \% in the description
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`className`, `url_property`, `percent_description` = NULL, additional_properties = NULL, ...) {
@@ -288,7 +288,7 @@ Date <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # Date$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # Date$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2-wrapper/R/dog.R b/samples/client/petstore/R-httr2-wrapper/R/dog.R
index a814c57d5869..068eec8eca83 100644
--- a/samples/client/petstore/R-httr2-wrapper/R/dog.R
+++ b/samples/client/petstore/R-httr2-wrapper/R/dog.R
@@ -32,7 +32,7 @@ Dog <- R6::R6Class(
     #' @param className className
     #' @param color color. Default to "red".
     #' @param breed breed
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`className`, `color` = "red", `breed` = NULL, additional_properties = NULL, ...) {
@@ -255,7 +255,7 @@ Dog <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # Dog$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # Dog$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2-wrapper/R/dog_all_of.R b/samples/client/petstore/R-httr2-wrapper/R/dog_all_of.R
index 17608478eedf..d35a85abbb52 100644
--- a/samples/client/petstore/R-httr2-wrapper/R/dog_all_of.R
+++ b/samples/client/petstore/R-httr2-wrapper/R/dog_all_of.R
@@ -25,7 +25,7 @@ DogAllOf <- R6::R6Class(
     #' Initialize a new DogAllOf class.
     #'
     #' @param breed breed
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`breed` = NULL, additional_properties = NULL, ...) {
@@ -186,7 +186,7 @@ DogAllOf <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # DogAllOf$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # DogAllOf$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2-wrapper/R/format_test.R b/samples/client/petstore/R-httr2-wrapper/R/format_test.R
index 4bd74e3a7275..85894ec7b1f5 100644
--- a/samples/client/petstore/R-httr2-wrapper/R/format_test.R
+++ b/samples/client/petstore/R-httr2-wrapper/R/format_test.R
@@ -67,7 +67,7 @@ FormatTest <- R6::R6Class(
     #' @param uuid uuid
     #' @param pattern_with_digits A string that is a 10 digit number. Can have leading zeros.
     #' @param pattern_with_digits_and_delimiter A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01.
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`number`, `byte`, `date`, `password`, `integer` = NULL, `int32` = NULL, `int64` = NULL, `float` = NULL, `double` = NULL, `string` = NULL, `binary` = NULL, `dateTime` = "2015-10-28T14:38:02Z", `uuid` = NULL, `pattern_with_digits` = NULL, `pattern_with_digits_and_delimiter` = NULL, additional_properties = NULL, ...) {
@@ -701,7 +701,7 @@ FormatTest <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # FormatTest$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # FormatTest$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2-wrapper/R/mammal.R b/samples/client/petstore/R-httr2-wrapper/R/mammal.R
index c9dd60c3e7c9..b96d79926ca8 100644
--- a/samples/client/petstore/R-httr2-wrapper/R/mammal.R
+++ b/samples/client/petstore/R-httr2-wrapper/R/mammal.R
@@ -217,7 +217,7 @@ Mammal <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 #Mammal$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 #Mammal$set("public", "print", function(...) {
 #  print(jsonlite::prettify(self$toJSONString()))
 #  invisible(self)
diff --git a/samples/client/petstore/R-httr2-wrapper/R/model_api_response.R b/samples/client/petstore/R-httr2-wrapper/R/model_api_response.R
index b0e4bbba7e97..028c66c72305 100644
--- a/samples/client/petstore/R-httr2-wrapper/R/model_api_response.R
+++ b/samples/client/petstore/R-httr2-wrapper/R/model_api_response.R
@@ -31,7 +31,7 @@ ModelApiResponse <- R6::R6Class(
     #' @param code code
     #' @param type type
     #' @param message message
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`code` = NULL, `type` = NULL, `message` = NULL, additional_properties = NULL, ...) {
@@ -236,7 +236,7 @@ ModelApiResponse <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # ModelApiResponse$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # ModelApiResponse$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2-wrapper/R/nested_one_of.R b/samples/client/petstore/R-httr2-wrapper/R/nested_one_of.R
index 73f4e938cbd3..d2a670b4eddb 100644
--- a/samples/client/petstore/R-httr2-wrapper/R/nested_one_of.R
+++ b/samples/client/petstore/R-httr2-wrapper/R/nested_one_of.R
@@ -28,7 +28,7 @@ NestedOneOf <- R6::R6Class(
     #'
     #' @param size size
     #' @param nested_pig nested_pig
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`size` = NULL, `nested_pig` = NULL, additional_properties = NULL, ...) {
@@ -211,7 +211,7 @@ NestedOneOf <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # NestedOneOf$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # NestedOneOf$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2-wrapper/R/one_of_primitive_type_test.R b/samples/client/petstore/R-httr2-wrapper/R/one_of_primitive_type_test.R
index ed13169f9027..faf3f7850ab8 100644
--- a/samples/client/petstore/R-httr2-wrapper/R/one_of_primitive_type_test.R
+++ b/samples/client/petstore/R-httr2-wrapper/R/one_of_primitive_type_test.R
@@ -193,7 +193,7 @@ OneOfPrimitiveTypeTest <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 #OneOfPrimitiveTypeTest$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 #OneOfPrimitiveTypeTest$set("public", "print", function(...) {
 #  print(jsonlite::prettify(self$toJSONString()))
 #  invisible(self)
diff --git a/samples/client/petstore/R-httr2-wrapper/R/order.R b/samples/client/petstore/R-httr2-wrapper/R/order.R
index 266468962695..08c080464e64 100644
--- a/samples/client/petstore/R-httr2-wrapper/R/order.R
+++ b/samples/client/petstore/R-httr2-wrapper/R/order.R
@@ -40,7 +40,7 @@ Order <- R6::R6Class(
     #' @param shipDate shipDate
     #' @param status Order Status
     #' @param complete complete. Default to FALSE.
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`id` = NULL, `petId` = NULL, `quantity` = NULL, `shipDate` = NULL, `status` = NULL, `complete` = FALSE, additional_properties = NULL, ...) {
@@ -320,7 +320,7 @@ Order <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # Order$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # Order$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2-wrapper/R/pet.R b/samples/client/petstore/R-httr2-wrapper/R/pet.R
index 8be5a0583359..42db1ecb8855 100644
--- a/samples/client/petstore/R-httr2-wrapper/R/pet.R
+++ b/samples/client/petstore/R-httr2-wrapper/R/pet.R
@@ -40,7 +40,7 @@ Pet <- R6::R6Class(
     #' @param category category
     #' @param tags tags
     #' @param status pet status in the store
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`name`, `photoUrls`, `id` = NULL, `category` = NULL, `tags` = NULL, `status` = NULL, additional_properties = NULL, ...) {
@@ -353,7 +353,7 @@ Pet <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # Pet$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # Pet$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2-wrapper/R/pig.R b/samples/client/petstore/R-httr2-wrapper/R/pig.R
index f5d81b793921..a7139f4795b6 100644
--- a/samples/client/petstore/R-httr2-wrapper/R/pig.R
+++ b/samples/client/petstore/R-httr2-wrapper/R/pig.R
@@ -217,7 +217,7 @@ Pig <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 #Pig$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 #Pig$set("public", "print", function(...) {
 #  print(jsonlite::prettify(self$toJSONString()))
 #  invisible(self)
diff --git a/samples/client/petstore/R-httr2-wrapper/R/special.R b/samples/client/petstore/R-httr2-wrapper/R/special.R
index 39664bea75ce..27a23809a070 100644
--- a/samples/client/petstore/R-httr2-wrapper/R/special.R
+++ b/samples/client/petstore/R-httr2-wrapper/R/special.R
@@ -43,7 +43,7 @@ Special <- R6::R6Class(
     #' @param 123_number 123_number
     #' @param array[test] array[test]
     #' @param empty_string empty_string
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`set_test` = NULL, `item_self` = NULL, `item_private` = NULL, `item_super` = NULL, `123_number` = NULL, `array[test]` = NULL, `empty_string` = NULL, additional_properties = NULL, ...) {
@@ -346,7 +346,7 @@ Special <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # Special$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # Special$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2-wrapper/R/store_api.R b/samples/client/petstore/R-httr2-wrapper/R/store_api.R
index 129e5d06d2b7..d5238552acfe 100644
--- a/samples/client/petstore/R-httr2-wrapper/R/store_api.R
+++ b/samples/client/petstore/R-httr2-wrapper/R/store_api.R
@@ -54,7 +54,7 @@
 #' }
 #'
 #' \strong{ get_order_by_id } \emph{ Find purchase order by ID }
-#' For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+#' For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 #'
 #' \itemize{
 #' \item \emph{ @param } order_id integer
diff --git a/samples/client/petstore/R-httr2-wrapper/R/tag.R b/samples/client/petstore/R-httr2-wrapper/R/tag.R
index be068d1474c5..52079beeb09f 100644
--- a/samples/client/petstore/R-httr2-wrapper/R/tag.R
+++ b/samples/client/petstore/R-httr2-wrapper/R/tag.R
@@ -28,7 +28,7 @@ Tag <- R6::R6Class(
     #'
     #' @param id id
     #' @param name name
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`id` = NULL, `name` = NULL, additional_properties = NULL, ...) {
@@ -211,7 +211,7 @@ Tag <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # Tag$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # Tag$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2-wrapper/R/update_pet_request.R b/samples/client/petstore/R-httr2-wrapper/R/update_pet_request.R
index bde06df6a8a7..2fc96ab4fffa 100644
--- a/samples/client/petstore/R-httr2-wrapper/R/update_pet_request.R
+++ b/samples/client/petstore/R-httr2-wrapper/R/update_pet_request.R
@@ -28,7 +28,7 @@ UpdatePetRequest <- R6::R6Class(
     #'
     #' @param jsonData jsonData
     #' @param binaryDataN2Information binaryDataN2Information
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`jsonData` = NULL, `binaryDataN2Information` = NULL, additional_properties = NULL, ...) {
@@ -208,7 +208,7 @@ UpdatePetRequest <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # UpdatePetRequest$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # UpdatePetRequest$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2-wrapper/R/user.R b/samples/client/petstore/R-httr2-wrapper/R/user.R
index 43b51ffa41c2..533469b64229 100644
--- a/samples/client/petstore/R-httr2-wrapper/R/user.R
+++ b/samples/client/petstore/R-httr2-wrapper/R/user.R
@@ -46,7 +46,7 @@ User <- R6::R6Class(
     #' @param password password
     #' @param phone phone
     #' @param userStatus User Status
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`id` = NULL, `username` = NULL, `firstName` = NULL, `lastName` = NULL, `email` = NULL, `password` = NULL, `phone` = NULL, `userStatus` = NULL, additional_properties = NULL, ...) {
@@ -361,7 +361,7 @@ User <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # User$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # User$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2-wrapper/R/whale.R b/samples/client/petstore/R-httr2-wrapper/R/whale.R
index dc70b1dd33e5..3305ab6ce6d7 100644
--- a/samples/client/petstore/R-httr2-wrapper/R/whale.R
+++ b/samples/client/petstore/R-httr2-wrapper/R/whale.R
@@ -31,7 +31,7 @@ Whale <- R6::R6Class(
     #' @param className className
     #' @param hasBaleen hasBaleen
     #' @param hasTeeth hasTeeth
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`className`, `hasBaleen` = NULL, `hasTeeth` = NULL, additional_properties = NULL, ...) {
@@ -254,7 +254,7 @@ Whale <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # Whale$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # Whale$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2-wrapper/R/zebra.R b/samples/client/petstore/R-httr2-wrapper/R/zebra.R
index c8d06d23d6a5..122e76d20ea3 100644
--- a/samples/client/petstore/R-httr2-wrapper/R/zebra.R
+++ b/samples/client/petstore/R-httr2-wrapper/R/zebra.R
@@ -28,7 +28,7 @@ Zebra <- R6::R6Class(
     #'
     #' @param className className
     #' @param type type
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`className`, `type` = NULL, additional_properties = NULL, ...) {
@@ -238,7 +238,7 @@ Zebra <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # Zebra$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # Zebra$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2-wrapper/docs/StoreApi.md b/samples/client/petstore/R-httr2-wrapper/docs/StoreApi.md
index 91cfa8e765d0..9818d6e3f062 100644
--- a/samples/client/petstore/R-httr2-wrapper/docs/StoreApi.md
+++ b/samples/client/petstore/R-httr2-wrapper/docs/StoreApi.md
@@ -129,7 +129,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```R
diff --git a/samples/client/petstore/R-httr2-wrapper/tests/testthat/test_petstore.R b/samples/client/petstore/R-httr2-wrapper/tests/testthat/test_petstore.R
index df15619de1bc..917d3fb00ec4 100644
--- a/samples/client/petstore/R-httr2-wrapper/tests/testthat/test_petstore.R
+++ b/samples/client/petstore/R-httr2-wrapper/tests/testthat/test_petstore.R
@@ -524,7 +524,7 @@ test_that("Tests oneOf", {
   # class name test
   expect_equal(get(class(basque_pig$actual_instance)[[1]], pos = -1)$classname, "BasquePig")
 
-  # test contructors
+  # test constructors
   pig2 <- Pig$new(instance = basque_pig$actual_instance)
   expect_equal(pig2$actual_type, "BasquePig")
   expect_equal(pig2$actual_instance$color, "red")
diff --git a/samples/client/petstore/R-httr2-wrapper/tests/testthat/test_store_api.R b/samples/client/petstore/R-httr2-wrapper/tests/testthat/test_store_api.R
index 1ebb3f82a639..3ce6f412c93d 100644
--- a/samples/client/petstore/R-httr2-wrapper/tests/testthat/test_store_api.R
+++ b/samples/client/petstore/R-httr2-wrapper/tests/testthat/test_store_api.R
@@ -32,7 +32,7 @@ test_that("GetOrderById", {
   # tests for GetOrderById
   # base path: http://petstore.swagger.io/v2
   # Find purchase order by ID
-  # For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+  # For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
   # @param order.id integer ID of pet that needs to be fetched
   # @return [Order]
 
diff --git a/samples/client/petstore/R-httr2/.openapi-generator-ignore b/samples/client/petstore/R-httr2/.openapi-generator-ignore
index c5fa491b4c55..deed424f8a15 100644
--- a/samples/client/petstore/R-httr2/.openapi-generator-ignore
+++ b/samples/client/petstore/R-httr2/.openapi-generator-ignore
@@ -5,7 +5,7 @@
 # The patterns follow closely to .gitignore or .dockerignore.
 
 # As an example, the C# client generator defines ApiClient.cs.
-# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+# You can make changes and tell Swagger Codegen to ignore just this file by uncommenting the following line:
 #ApiClient.cs
 
 # You can match any string of characters against a directory, file or extension with a single asterisk (*):
diff --git a/samples/client/petstore/R-httr2/R/allof_tag_api_response.R b/samples/client/petstore/R-httr2/R/allof_tag_api_response.R
index c4134b53e68f..98a3cd8fd657 100644
--- a/samples/client/petstore/R-httr2/R/allof_tag_api_response.R
+++ b/samples/client/petstore/R-httr2/R/allof_tag_api_response.R
@@ -253,7 +253,7 @@ AllofTagApiResponse <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # AllofTagApiResponse$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # AllofTagApiResponse$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2/R/animal.R b/samples/client/petstore/R-httr2/R/animal.R
index 6b4d78ff5ede..3c62c6687e4f 100644
--- a/samples/client/petstore/R-httr2/R/animal.R
+++ b/samples/client/petstore/R-httr2/R/animal.R
@@ -198,7 +198,7 @@ Animal <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # Animal$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # Animal$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2/R/any_of_pig.R b/samples/client/petstore/R-httr2/R/any_of_pig.R
index 64e859d560bc..34736dc7f38c 100644
--- a/samples/client/petstore/R-httr2/R/any_of_pig.R
+++ b/samples/client/petstore/R-httr2/R/any_of_pig.R
@@ -174,7 +174,7 @@ AnyOfPig <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 #AnyOfPig$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 #AnyOfPig$set("public", "print", function(...) {
 #  print(jsonlite::prettify(self$toJSONString()))
 #  invisible(self)
diff --git a/samples/client/petstore/R-httr2/R/any_of_primitive_type_test.R b/samples/client/petstore/R-httr2/R/any_of_primitive_type_test.R
index da1e53ce4729..c34326a3161f 100644
--- a/samples/client/petstore/R-httr2/R/any_of_primitive_type_test.R
+++ b/samples/client/petstore/R-httr2/R/any_of_primitive_type_test.R
@@ -193,7 +193,7 @@ AnyOfPrimitiveTypeTest <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 #AnyOfPrimitiveTypeTest$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 #AnyOfPrimitiveTypeTest$set("public", "print", function(...) {
 #  print(jsonlite::prettify(self$toJSONString()))
 #  invisible(self)
diff --git a/samples/client/petstore/R-httr2/R/api_client.R b/samples/client/petstore/R-httr2/R/api_client.R
index 3ca3cf9ce7f4..5ad09ce50e02 100644
--- a/samples/client/petstore/R-httr2/R/api_client.R
+++ b/samples/client/petstore/R-httr2/R/api_client.R
@@ -163,7 +163,7 @@ ApiClient  <- R6::R6Class(
     #' @param header_params The header parameters.
     #' @param form_params The form parameters.
     #' @param file_params The form parameters to upload files.
-    #' @param accepts The HTTP accpet headers.
+    #' @param accepts The HTTP accept headers.
     #' @param content_types The HTTP content-type headers.
     #' @param body The HTTP request body.
     #' @param is_oauth True if the endpoints required OAuth authentication.
@@ -194,7 +194,7 @@ ApiClient  <- R6::R6Class(
     #' @param header_params The header parameters.
     #' @param form_params The form parameters.
     #' @param file_params The form parameters for uploading files.
-    #' @param accepts The HTTP accpet headers.
+    #' @param accepts The HTTP accept headers.
     #' @param content_types The HTTP content-type headers.
     #' @param body The HTTP request body.
     #' @param is_oauth True if the endpoints required OAuth authentication.
@@ -405,10 +405,10 @@ ApiClient  <- R6::R6Class(
       }
       return_obj
     },
-    #' Return a propery header (for accept or content-type).
+    #' Return a property header (for accept or content-type).
     #'
     #' @description
-    #' Return a propery header (for accept or content-type). If JSON-related MIME is found,
+    #' Return a property header (for accept or content-type). If JSON-related MIME is found,
     #' return it. Otherwise, return the first one, if any.
     #'
     #' @param headers A list of headers
diff --git a/samples/client/petstore/R-httr2/R/api_response.R b/samples/client/petstore/R-httr2/R/api_response.R
index 70431ae7e582..6cff851aed42 100644
--- a/samples/client/petstore/R-httr2/R/api_response.R
+++ b/samples/client/petstore/R-httr2/R/api_response.R
@@ -12,7 +12,7 @@
 #' @field content The deserialized response body.
 #' @field response The raw response from the endpoint.
 #' @field status_code The HTTP response status code.
-#' @field status_code_desc The brief descriptoin of the HTTP response status code.
+#' @field status_code_desc The brief description of the HTTP response status code.
 #' @field headers The HTTP response headers.
 #' @export
 ApiResponse <- R6::R6Class(
diff --git a/samples/client/petstore/R-httr2/R/basque_pig.R b/samples/client/petstore/R-httr2/R/basque_pig.R
index 28a10e6ddc44..53756e06c441 100644
--- a/samples/client/petstore/R-httr2/R/basque_pig.R
+++ b/samples/client/petstore/R-httr2/R/basque_pig.R
@@ -214,7 +214,7 @@ BasquePig <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # BasquePig$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # BasquePig$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2/R/cat.R b/samples/client/petstore/R-httr2/R/cat.R
index eaba966de584..861a3b174ae4 100644
--- a/samples/client/petstore/R-httr2/R/cat.R
+++ b/samples/client/petstore/R-httr2/R/cat.R
@@ -222,7 +222,7 @@ Cat <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # Cat$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # Cat$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2/R/cat_all_of.R b/samples/client/petstore/R-httr2/R/cat_all_of.R
index d2889ac4990b..6ce939b452df 100644
--- a/samples/client/petstore/R-httr2/R/cat_all_of.R
+++ b/samples/client/petstore/R-httr2/R/cat_all_of.R
@@ -153,7 +153,7 @@ CatAllOf <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # CatAllOf$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # CatAllOf$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2/R/category.R b/samples/client/petstore/R-httr2/R/category.R
index 82c562286049..67c8059bc8fe 100644
--- a/samples/client/petstore/R-httr2/R/category.R
+++ b/samples/client/petstore/R-httr2/R/category.R
@@ -186,7 +186,7 @@ Category <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # Category$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # Category$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2/R/danish_pig.R b/samples/client/petstore/R-httr2/R/danish_pig.R
index aea435d0fbf1..84e4b50ea893 100644
--- a/samples/client/petstore/R-httr2/R/danish_pig.R
+++ b/samples/client/petstore/R-httr2/R/danish_pig.R
@@ -214,7 +214,7 @@ DanishPig <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # DanishPig$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # DanishPig$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2/R/date.R b/samples/client/petstore/R-httr2/R/date.R
index a188cad8fce6..482bb1ef037f 100644
--- a/samples/client/petstore/R-httr2/R/date.R
+++ b/samples/client/petstore/R-httr2/R/date.R
@@ -255,7 +255,7 @@ Date <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # Date$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # Date$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2/R/dog.R b/samples/client/petstore/R-httr2/R/dog.R
index 9585ef81a58c..9916c7bb2e33 100644
--- a/samples/client/petstore/R-httr2/R/dog.R
+++ b/samples/client/petstore/R-httr2/R/dog.R
@@ -222,7 +222,7 @@ Dog <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # Dog$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # Dog$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2/R/dog_all_of.R b/samples/client/petstore/R-httr2/R/dog_all_of.R
index c9ad55312255..42f587493a7f 100644
--- a/samples/client/petstore/R-httr2/R/dog_all_of.R
+++ b/samples/client/petstore/R-httr2/R/dog_all_of.R
@@ -153,7 +153,7 @@ DogAllOf <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # DogAllOf$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # DogAllOf$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2/R/format_test.R b/samples/client/petstore/R-httr2/R/format_test.R
index 8361a769f0ff..e07519373d3d 100644
--- a/samples/client/petstore/R-httr2/R/format_test.R
+++ b/samples/client/petstore/R-httr2/R/format_test.R
@@ -668,7 +668,7 @@ FormatTest <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # FormatTest$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # FormatTest$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2/R/mammal.R b/samples/client/petstore/R-httr2/R/mammal.R
index 9864432e8fb9..a5af6d76d644 100644
--- a/samples/client/petstore/R-httr2/R/mammal.R
+++ b/samples/client/petstore/R-httr2/R/mammal.R
@@ -191,7 +191,7 @@ Mammal <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 #Mammal$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 #Mammal$set("public", "print", function(...) {
 #  print(jsonlite::prettify(self$toJSONString()))
 #  invisible(self)
diff --git a/samples/client/petstore/R-httr2/R/model_api_response.R b/samples/client/petstore/R-httr2/R/model_api_response.R
index 0fd0c71e99c3..de62918e893a 100644
--- a/samples/client/petstore/R-httr2/R/model_api_response.R
+++ b/samples/client/petstore/R-httr2/R/model_api_response.R
@@ -203,7 +203,7 @@ ModelApiResponse <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # ModelApiResponse$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # ModelApiResponse$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2/R/nested_one_of.R b/samples/client/petstore/R-httr2/R/nested_one_of.R
index beef5124f9b5..a2c5fc4b83ce 100644
--- a/samples/client/petstore/R-httr2/R/nested_one_of.R
+++ b/samples/client/petstore/R-httr2/R/nested_one_of.R
@@ -178,7 +178,7 @@ NestedOneOf <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # NestedOneOf$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # NestedOneOf$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2/R/one_of_primitive_type_test.R b/samples/client/petstore/R-httr2/R/one_of_primitive_type_test.R
index ed13169f9027..faf3f7850ab8 100644
--- a/samples/client/petstore/R-httr2/R/one_of_primitive_type_test.R
+++ b/samples/client/petstore/R-httr2/R/one_of_primitive_type_test.R
@@ -193,7 +193,7 @@ OneOfPrimitiveTypeTest <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 #OneOfPrimitiveTypeTest$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 #OneOfPrimitiveTypeTest$set("public", "print", function(...) {
 #  print(jsonlite::prettify(self$toJSONString()))
 #  invisible(self)
diff --git a/samples/client/petstore/R-httr2/R/order.R b/samples/client/petstore/R-httr2/R/order.R
index b5604d999007..38975d63ee94 100644
--- a/samples/client/petstore/R-httr2/R/order.R
+++ b/samples/client/petstore/R-httr2/R/order.R
@@ -287,7 +287,7 @@ Order <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # Order$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # Order$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2/R/pet.R b/samples/client/petstore/R-httr2/R/pet.R
index be5b2767ef1f..7070dc689ea7 100644
--- a/samples/client/petstore/R-httr2/R/pet.R
+++ b/samples/client/petstore/R-httr2/R/pet.R
@@ -320,7 +320,7 @@ Pet <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # Pet$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # Pet$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2/R/pig.R b/samples/client/petstore/R-httr2/R/pig.R
index 570346408f34..d497bc280390 100644
--- a/samples/client/petstore/R-httr2/R/pig.R
+++ b/samples/client/petstore/R-httr2/R/pig.R
@@ -191,7 +191,7 @@ Pig <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 #Pig$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 #Pig$set("public", "print", function(...) {
 #  print(jsonlite::prettify(self$toJSONString()))
 #  invisible(self)
diff --git a/samples/client/petstore/R-httr2/R/special.R b/samples/client/petstore/R-httr2/R/special.R
index e2089142e9d6..34119a5ce55a 100644
--- a/samples/client/petstore/R-httr2/R/special.R
+++ b/samples/client/petstore/R-httr2/R/special.R
@@ -313,7 +313,7 @@ Special <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # Special$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # Special$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2/R/store_api.R b/samples/client/petstore/R-httr2/R/store_api.R
index b5941c11d85c..60b60fa0603b 100644
--- a/samples/client/petstore/R-httr2/R/store_api.R
+++ b/samples/client/petstore/R-httr2/R/store_api.R
@@ -54,7 +54,7 @@
 #' }
 #'
 #' \strong{ get_order_by_id } \emph{ Find purchase order by ID }
-#' For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+#' For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 #'
 #' \itemize{
 #' \item \emph{ @param } order_id integer
diff --git a/samples/client/petstore/R-httr2/R/tag.R b/samples/client/petstore/R-httr2/R/tag.R
index 51603e72ab3f..97c9906129a3 100644
--- a/samples/client/petstore/R-httr2/R/tag.R
+++ b/samples/client/petstore/R-httr2/R/tag.R
@@ -178,7 +178,7 @@ Tag <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # Tag$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # Tag$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2/R/update_pet_request.R b/samples/client/petstore/R-httr2/R/update_pet_request.R
index 1d37555f4b05..a2da076f8ded 100644
--- a/samples/client/petstore/R-httr2/R/update_pet_request.R
+++ b/samples/client/petstore/R-httr2/R/update_pet_request.R
@@ -175,7 +175,7 @@ UpdatePetRequest <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # UpdatePetRequest$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # UpdatePetRequest$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2/R/user.R b/samples/client/petstore/R-httr2/R/user.R
index 78896afef3c4..d37c45f4fa22 100644
--- a/samples/client/petstore/R-httr2/R/user.R
+++ b/samples/client/petstore/R-httr2/R/user.R
@@ -328,7 +328,7 @@ User <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # User$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # User$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2/R/whale.R b/samples/client/petstore/R-httr2/R/whale.R
index 084df84385a1..1ccb12a0bc91 100644
--- a/samples/client/petstore/R-httr2/R/whale.R
+++ b/samples/client/petstore/R-httr2/R/whale.R
@@ -221,7 +221,7 @@ Whale <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # Whale$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # Whale$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2/R/zebra.R b/samples/client/petstore/R-httr2/R/zebra.R
index 0a1aa587e113..09f0e554d63d 100644
--- a/samples/client/petstore/R-httr2/R/zebra.R
+++ b/samples/client/petstore/R-httr2/R/zebra.R
@@ -205,7 +205,7 @@ Zebra <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # Zebra$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # Zebra$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R-httr2/docs/StoreApi.md b/samples/client/petstore/R-httr2/docs/StoreApi.md
index c0453bb3610c..e34a7edd7895 100644
--- a/samples/client/petstore/R-httr2/docs/StoreApi.md
+++ b/samples/client/petstore/R-httr2/docs/StoreApi.md
@@ -129,7 +129,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```R
diff --git a/samples/client/petstore/R-httr2/man/StoreApi.Rd b/samples/client/petstore/R-httr2/man/StoreApi.Rd
index 2423e1819e05..1ed70bec6991 100644
--- a/samples/client/petstore/R-httr2/man/StoreApi.Rd
+++ b/samples/client/petstore/R-httr2/man/StoreApi.Rd
@@ -62,7 +62,7 @@ Returns a map of status codes to quantities
 }
 
 \strong{ GetOrderById } \emph{ Find purchase order by ID }
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 \itemize{
 \item \emph{ @param } order_id integer
diff --git a/samples/client/petstore/R-httr2/tests/testthat/test_petstore.R b/samples/client/petstore/R-httr2/tests/testthat/test_petstore.R
index 9e220b9af6d6..b612714b8122 100644
--- a/samples/client/petstore/R-httr2/tests/testthat/test_petstore.R
+++ b/samples/client/petstore/R-httr2/tests/testthat/test_petstore.R
@@ -331,7 +331,7 @@ test_that("Tests oneOf", {
   # class name test
   expect_equal(get(class(basque_pig$actual_instance)[[1]], pos = -1)$classname, "BasquePig")
 
-  # test contructors
+  # test constructors
   pig2 <- Pig$new(instance = basque_pig$actual_instance)
   expect_equal(pig2$actual_type, "BasquePig")
   expect_equal(pig2$actual_instance$color, "red")
diff --git a/samples/client/petstore/R-httr2/tests/testthat/test_store_api.R b/samples/client/petstore/R-httr2/tests/testthat/test_store_api.R
index 1ebb3f82a639..3ce6f412c93d 100644
--- a/samples/client/petstore/R-httr2/tests/testthat/test_store_api.R
+++ b/samples/client/petstore/R-httr2/tests/testthat/test_store_api.R
@@ -32,7 +32,7 @@ test_that("GetOrderById", {
   # tests for GetOrderById
   # base path: http://petstore.swagger.io/v2
   # Find purchase order by ID
-  # For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+  # For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
   # @param order.id integer ID of pet that needs to be fetched
   # @return [Order]
 
diff --git a/samples/client/petstore/R/.openapi-generator-ignore b/samples/client/petstore/R/.openapi-generator-ignore
index c5fa491b4c55..deed424f8a15 100644
--- a/samples/client/petstore/R/.openapi-generator-ignore
+++ b/samples/client/petstore/R/.openapi-generator-ignore
@@ -5,7 +5,7 @@
 # The patterns follow closely to .gitignore or .dockerignore.
 
 # As an example, the C# client generator defines ApiClient.cs.
-# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+# You can make changes and tell Swagger Codegen to ignore just this file by uncommenting the following line:
 #ApiClient.cs
 
 # You can match any string of characters against a directory, file or extension with a single asterisk (*):
diff --git a/samples/client/petstore/R/R/allof_tag_api_response.R b/samples/client/petstore/R/R/allof_tag_api_response.R
index 220d89ee5036..7cfd85917e92 100644
--- a/samples/client/petstore/R/R/allof_tag_api_response.R
+++ b/samples/client/petstore/R/R/allof_tag_api_response.R
@@ -37,7 +37,7 @@ AllofTagApiResponse <- R6::R6Class(
     #' @param code code
     #' @param type type
     #' @param message message
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`id` = NULL, `name` = NULL, `code` = NULL, `type` = NULL, `message` = NULL, additional_properties = NULL, ...) {
@@ -286,7 +286,7 @@ AllofTagApiResponse <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # AllofTagApiResponse$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # AllofTagApiResponse$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R/R/animal.R b/samples/client/petstore/R/R/animal.R
index b506bced42f9..a1689f8394fd 100644
--- a/samples/client/petstore/R/R/animal.R
+++ b/samples/client/petstore/R/R/animal.R
@@ -30,7 +30,7 @@ Animal <- R6::R6Class(
     #'
     #' @param className className
     #' @param color color. Default to "red".
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`className`, `color` = "red", additional_properties = NULL, ...) {
@@ -231,7 +231,7 @@ Animal <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # Animal$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # Animal$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R/R/any_of_pig.R b/samples/client/petstore/R/R/any_of_pig.R
index 64e859d560bc..34736dc7f38c 100644
--- a/samples/client/petstore/R/R/any_of_pig.R
+++ b/samples/client/petstore/R/R/any_of_pig.R
@@ -174,7 +174,7 @@ AnyOfPig <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 #AnyOfPig$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 #AnyOfPig$set("public", "print", function(...) {
 #  print(jsonlite::prettify(self$toJSONString()))
 #  invisible(self)
diff --git a/samples/client/petstore/R/R/any_of_primitive_type_test.R b/samples/client/petstore/R/R/any_of_primitive_type_test.R
index da1e53ce4729..c34326a3161f 100644
--- a/samples/client/petstore/R/R/any_of_primitive_type_test.R
+++ b/samples/client/petstore/R/R/any_of_primitive_type_test.R
@@ -193,7 +193,7 @@ AnyOfPrimitiveTypeTest <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 #AnyOfPrimitiveTypeTest$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 #AnyOfPrimitiveTypeTest$set("public", "print", function(...) {
 #  print(jsonlite::prettify(self$toJSONString()))
 #  invisible(self)
diff --git a/samples/client/petstore/R/R/api_client.R b/samples/client/petstore/R/R/api_client.R
index cd0958b02de5..6fe5c3488f1b 100644
--- a/samples/client/petstore/R/R/api_client.R
+++ b/samples/client/petstore/R/R/api_client.R
@@ -392,10 +392,10 @@ ApiClient <- R6::R6Class(
       }
       return_obj
     },
-    #' Return a propery header (for accept or content-type).
+    #' Return a property header (for accept or content-type).
     #'
     #' @description
-    #' Return a propery header (for accept or content-type). If JSON-related MIME is found,
+    #' Return a property header (for accept or content-type). If JSON-related MIME is found,
     #' return it. Otherwise, return the first one, if any.
     #'
     #' @param headers A list of headers
diff --git a/samples/client/petstore/R/R/api_response.R b/samples/client/petstore/R/R/api_response.R
index 70431ae7e582..6cff851aed42 100644
--- a/samples/client/petstore/R/R/api_response.R
+++ b/samples/client/petstore/R/R/api_response.R
@@ -12,7 +12,7 @@
 #' @field content The deserialized response body.
 #' @field response The raw response from the endpoint.
 #' @field status_code The HTTP response status code.
-#' @field status_code_desc The brief descriptoin of the HTTP response status code.
+#' @field status_code_desc The brief description of the HTTP response status code.
 #' @field headers The HTTP response headers.
 #' @export
 ApiResponse <- R6::R6Class(
diff --git a/samples/client/petstore/R/R/basque_pig.R b/samples/client/petstore/R/R/basque_pig.R
index ac83042c8cfd..048bff78e75c 100644
--- a/samples/client/petstore/R/R/basque_pig.R
+++ b/samples/client/petstore/R/R/basque_pig.R
@@ -28,7 +28,7 @@ BasquePig <- R6::R6Class(
     #'
     #' @param className className
     #' @param color color
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`className`, `color`, additional_properties = NULL, ...) {
@@ -247,7 +247,7 @@ BasquePig <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # BasquePig$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # BasquePig$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R/R/cat.R b/samples/client/petstore/R/R/cat.R
index f74e2d887ddd..9198500c01a2 100644
--- a/samples/client/petstore/R/R/cat.R
+++ b/samples/client/petstore/R/R/cat.R
@@ -32,7 +32,7 @@ Cat <- R6::R6Class(
     #' @param className className
     #' @param color color. Default to "red".
     #' @param declawed declawed
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`className`, `color` = "red", `declawed` = NULL, additional_properties = NULL, ...) {
@@ -255,7 +255,7 @@ Cat <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # Cat$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # Cat$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R/R/cat_all_of.R b/samples/client/petstore/R/R/cat_all_of.R
index 197e1a46e3a5..d25992a78780 100644
--- a/samples/client/petstore/R/R/cat_all_of.R
+++ b/samples/client/petstore/R/R/cat_all_of.R
@@ -25,7 +25,7 @@ CatAllOf <- R6::R6Class(
     #' Initialize a new CatAllOf class.
     #'
     #' @param declawed declawed
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`declawed` = NULL, additional_properties = NULL, ...) {
@@ -186,7 +186,7 @@ CatAllOf <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # CatAllOf$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # CatAllOf$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R/R/category.R b/samples/client/petstore/R/R/category.R
index 2646d01bd723..175b3cbb9aeb 100644
--- a/samples/client/petstore/R/R/category.R
+++ b/samples/client/petstore/R/R/category.R
@@ -28,7 +28,7 @@ Category <- R6::R6Class(
     #'
     #' @param id id
     #' @param name name
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`id` = NULL, `name` = NULL, additional_properties = NULL, ...) {
@@ -219,7 +219,7 @@ Category <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # Category$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # Category$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R/R/danish_pig.R b/samples/client/petstore/R/R/danish_pig.R
index 06cf5096a889..627bd413163e 100644
--- a/samples/client/petstore/R/R/danish_pig.R
+++ b/samples/client/petstore/R/R/danish_pig.R
@@ -28,7 +28,7 @@ DanishPig <- R6::R6Class(
     #'
     #' @param className className
     #' @param size size
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`className`, `size`, additional_properties = NULL, ...) {
@@ -247,7 +247,7 @@ DanishPig <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # DanishPig$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # DanishPig$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R/R/date.R b/samples/client/petstore/R/R/date.R
index 79945bc8cfcf..3299b6658ad1 100644
--- a/samples/client/petstore/R/R/date.R
+++ b/samples/client/petstore/R/R/date.R
@@ -31,7 +31,7 @@ Date <- R6::R6Class(
     #' @param className className
     #' @param url_property url_property
     #' @param percent_description using \% in the description
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`className`, `url_property`, `percent_description` = NULL, additional_properties = NULL, ...) {
@@ -288,7 +288,7 @@ Date <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # Date$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # Date$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R/R/dog.R b/samples/client/petstore/R/R/dog.R
index a814c57d5869..068eec8eca83 100644
--- a/samples/client/petstore/R/R/dog.R
+++ b/samples/client/petstore/R/R/dog.R
@@ -32,7 +32,7 @@ Dog <- R6::R6Class(
     #' @param className className
     #' @param color color. Default to "red".
     #' @param breed breed
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`className`, `color` = "red", `breed` = NULL, additional_properties = NULL, ...) {
@@ -255,7 +255,7 @@ Dog <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # Dog$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # Dog$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R/R/dog_all_of.R b/samples/client/petstore/R/R/dog_all_of.R
index 17608478eedf..d35a85abbb52 100644
--- a/samples/client/petstore/R/R/dog_all_of.R
+++ b/samples/client/petstore/R/R/dog_all_of.R
@@ -25,7 +25,7 @@ DogAllOf <- R6::R6Class(
     #' Initialize a new DogAllOf class.
     #'
     #' @param breed breed
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`breed` = NULL, additional_properties = NULL, ...) {
@@ -186,7 +186,7 @@ DogAllOf <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # DogAllOf$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # DogAllOf$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R/R/format_test.R b/samples/client/petstore/R/R/format_test.R
index 4bd74e3a7275..85894ec7b1f5 100644
--- a/samples/client/petstore/R/R/format_test.R
+++ b/samples/client/petstore/R/R/format_test.R
@@ -67,7 +67,7 @@ FormatTest <- R6::R6Class(
     #' @param uuid uuid
     #' @param pattern_with_digits A string that is a 10 digit number. Can have leading zeros.
     #' @param pattern_with_digits_and_delimiter A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01.
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`number`, `byte`, `date`, `password`, `integer` = NULL, `int32` = NULL, `int64` = NULL, `float` = NULL, `double` = NULL, `string` = NULL, `binary` = NULL, `dateTime` = "2015-10-28T14:38:02Z", `uuid` = NULL, `pattern_with_digits` = NULL, `pattern_with_digits_and_delimiter` = NULL, additional_properties = NULL, ...) {
@@ -701,7 +701,7 @@ FormatTest <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # FormatTest$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # FormatTest$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R/R/mammal.R b/samples/client/petstore/R/R/mammal.R
index 9864432e8fb9..a5af6d76d644 100644
--- a/samples/client/petstore/R/R/mammal.R
+++ b/samples/client/petstore/R/R/mammal.R
@@ -191,7 +191,7 @@ Mammal <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 #Mammal$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 #Mammal$set("public", "print", function(...) {
 #  print(jsonlite::prettify(self$toJSONString()))
 #  invisible(self)
diff --git a/samples/client/petstore/R/R/model_api_response.R b/samples/client/petstore/R/R/model_api_response.R
index b0e4bbba7e97..028c66c72305 100644
--- a/samples/client/petstore/R/R/model_api_response.R
+++ b/samples/client/petstore/R/R/model_api_response.R
@@ -31,7 +31,7 @@ ModelApiResponse <- R6::R6Class(
     #' @param code code
     #' @param type type
     #' @param message message
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`code` = NULL, `type` = NULL, `message` = NULL, additional_properties = NULL, ...) {
@@ -236,7 +236,7 @@ ModelApiResponse <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # ModelApiResponse$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # ModelApiResponse$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R/R/nested_one_of.R b/samples/client/petstore/R/R/nested_one_of.R
index 73f4e938cbd3..d2a670b4eddb 100644
--- a/samples/client/petstore/R/R/nested_one_of.R
+++ b/samples/client/petstore/R/R/nested_one_of.R
@@ -28,7 +28,7 @@ NestedOneOf <- R6::R6Class(
     #'
     #' @param size size
     #' @param nested_pig nested_pig
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`size` = NULL, `nested_pig` = NULL, additional_properties = NULL, ...) {
@@ -211,7 +211,7 @@ NestedOneOf <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # NestedOneOf$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # NestedOneOf$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R/R/one_of_primitive_type_test.R b/samples/client/petstore/R/R/one_of_primitive_type_test.R
index ed13169f9027..faf3f7850ab8 100644
--- a/samples/client/petstore/R/R/one_of_primitive_type_test.R
+++ b/samples/client/petstore/R/R/one_of_primitive_type_test.R
@@ -193,7 +193,7 @@ OneOfPrimitiveTypeTest <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 #OneOfPrimitiveTypeTest$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 #OneOfPrimitiveTypeTest$set("public", "print", function(...) {
 #  print(jsonlite::prettify(self$toJSONString()))
 #  invisible(self)
diff --git a/samples/client/petstore/R/R/order.R b/samples/client/petstore/R/R/order.R
index 266468962695..08c080464e64 100644
--- a/samples/client/petstore/R/R/order.R
+++ b/samples/client/petstore/R/R/order.R
@@ -40,7 +40,7 @@ Order <- R6::R6Class(
     #' @param shipDate shipDate
     #' @param status Order Status
     #' @param complete complete. Default to FALSE.
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`id` = NULL, `petId` = NULL, `quantity` = NULL, `shipDate` = NULL, `status` = NULL, `complete` = FALSE, additional_properties = NULL, ...) {
@@ -320,7 +320,7 @@ Order <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # Order$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # Order$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R/R/pet.R b/samples/client/petstore/R/R/pet.R
index 8be5a0583359..42db1ecb8855 100644
--- a/samples/client/petstore/R/R/pet.R
+++ b/samples/client/petstore/R/R/pet.R
@@ -40,7 +40,7 @@ Pet <- R6::R6Class(
     #' @param category category
     #' @param tags tags
     #' @param status pet status in the store
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`name`, `photoUrls`, `id` = NULL, `category` = NULL, `tags` = NULL, `status` = NULL, additional_properties = NULL, ...) {
@@ -353,7 +353,7 @@ Pet <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # Pet$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # Pet$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R/R/pig.R b/samples/client/petstore/R/R/pig.R
index 570346408f34..d497bc280390 100644
--- a/samples/client/petstore/R/R/pig.R
+++ b/samples/client/petstore/R/R/pig.R
@@ -191,7 +191,7 @@ Pig <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 #Pig$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 #Pig$set("public", "print", function(...) {
 #  print(jsonlite::prettify(self$toJSONString()))
 #  invisible(self)
diff --git a/samples/client/petstore/R/R/special.R b/samples/client/petstore/R/R/special.R
index 39664bea75ce..27a23809a070 100644
--- a/samples/client/petstore/R/R/special.R
+++ b/samples/client/petstore/R/R/special.R
@@ -43,7 +43,7 @@ Special <- R6::R6Class(
     #' @param 123_number 123_number
     #' @param array[test] array[test]
     #' @param empty_string empty_string
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`set_test` = NULL, `item_self` = NULL, `item_private` = NULL, `item_super` = NULL, `123_number` = NULL, `array[test]` = NULL, `empty_string` = NULL, additional_properties = NULL, ...) {
@@ -346,7 +346,7 @@ Special <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # Special$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # Special$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R/R/store_api.R b/samples/client/petstore/R/R/store_api.R
index 1daff7db8201..20eb0cd2cd42 100644
--- a/samples/client/petstore/R/R/store_api.R
+++ b/samples/client/petstore/R/R/store_api.R
@@ -54,7 +54,7 @@
 #' }
 #'
 #' \strong{ GetOrderById } \emph{ Find purchase order by ID }
-#' For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+#' For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 #'
 #' \itemize{
 #' \item \emph{ @param } order_id integer
diff --git a/samples/client/petstore/R/R/tag.R b/samples/client/petstore/R/R/tag.R
index be068d1474c5..52079beeb09f 100644
--- a/samples/client/petstore/R/R/tag.R
+++ b/samples/client/petstore/R/R/tag.R
@@ -28,7 +28,7 @@ Tag <- R6::R6Class(
     #'
     #' @param id id
     #' @param name name
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`id` = NULL, `name` = NULL, additional_properties = NULL, ...) {
@@ -211,7 +211,7 @@ Tag <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # Tag$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # Tag$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R/R/update_pet_request.R b/samples/client/petstore/R/R/update_pet_request.R
index bde06df6a8a7..2fc96ab4fffa 100644
--- a/samples/client/petstore/R/R/update_pet_request.R
+++ b/samples/client/petstore/R/R/update_pet_request.R
@@ -28,7 +28,7 @@ UpdatePetRequest <- R6::R6Class(
     #'
     #' @param jsonData jsonData
     #' @param binaryDataN2Information binaryDataN2Information
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`jsonData` = NULL, `binaryDataN2Information` = NULL, additional_properties = NULL, ...) {
@@ -208,7 +208,7 @@ UpdatePetRequest <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # UpdatePetRequest$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # UpdatePetRequest$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R/R/user.R b/samples/client/petstore/R/R/user.R
index 43b51ffa41c2..533469b64229 100644
--- a/samples/client/petstore/R/R/user.R
+++ b/samples/client/petstore/R/R/user.R
@@ -46,7 +46,7 @@ User <- R6::R6Class(
     #' @param password password
     #' @param phone phone
     #' @param userStatus User Status
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`id` = NULL, `username` = NULL, `firstName` = NULL, `lastName` = NULL, `email` = NULL, `password` = NULL, `phone` = NULL, `userStatus` = NULL, additional_properties = NULL, ...) {
@@ -361,7 +361,7 @@ User <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # User$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # User$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R/R/whale.R b/samples/client/petstore/R/R/whale.R
index dc70b1dd33e5..3305ab6ce6d7 100644
--- a/samples/client/petstore/R/R/whale.R
+++ b/samples/client/petstore/R/R/whale.R
@@ -31,7 +31,7 @@ Whale <- R6::R6Class(
     #' @param className className
     #' @param hasBaleen hasBaleen
     #' @param hasTeeth hasTeeth
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`className`, `hasBaleen` = NULL, `hasTeeth` = NULL, additional_properties = NULL, ...) {
@@ -254,7 +254,7 @@ Whale <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # Whale$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # Whale$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R/R/zebra.R b/samples/client/petstore/R/R/zebra.R
index c8d06d23d6a5..122e76d20ea3 100644
--- a/samples/client/petstore/R/R/zebra.R
+++ b/samples/client/petstore/R/R/zebra.R
@@ -28,7 +28,7 @@ Zebra <- R6::R6Class(
     #'
     #' @param className className
     #' @param type type
-    #' @param additional_properties additonal properties (optional)
+    #' @param additional_properties additional properties (optional)
     #' @param ... Other optional arguments.
     #' @export
     initialize = function(`className`, `type` = NULL, additional_properties = NULL, ...) {
@@ -238,7 +238,7 @@ Zebra <- R6::R6Class(
 ## Uncomment below to unlock the class to allow modifications of the method or field
 # Zebra$unlock()
 #
-## Below is an example to define the print fnuction
+## Below is an example to define the print function
 # Zebra$set("public", "print", function(...) {
 #   print(jsonlite::prettify(self$toJSONString()))
 #   invisible(self)
diff --git a/samples/client/petstore/R/docs/StoreApi.md b/samples/client/petstore/R/docs/StoreApi.md
index b58b49eb7629..cfd0f5207650 100644
--- a/samples/client/petstore/R/docs/StoreApi.md
+++ b/samples/client/petstore/R/docs/StoreApi.md
@@ -129,7 +129,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```R
diff --git a/samples/client/petstore/R/tests/testthat/test_petstore.R b/samples/client/petstore/R/tests/testthat/test_petstore.R
index aee591b52567..f7a70df4f9d5 100644
--- a/samples/client/petstore/R/tests/testthat/test_petstore.R
+++ b/samples/client/petstore/R/tests/testthat/test_petstore.R
@@ -265,7 +265,7 @@ test_that("Tests oneOf", {
   # class name test
   expect_equal(get(class(basque_pig$actual_instance)[[1]], pos = -1)$classname, "BasquePig")
 
-  # test contructors
+  # test constructors
   pig2 <- Pig$new(instance = basque_pig$actual_instance)
   expect_equal(pig2$actual_type, "BasquePig")
   expect_equal(pig2$actual_instance$color, "red")
diff --git a/samples/client/petstore/R/tests/testthat/test_store_api.R b/samples/client/petstore/R/tests/testthat/test_store_api.R
index 1ebb3f82a639..3ce6f412c93d 100644
--- a/samples/client/petstore/R/tests/testthat/test_store_api.R
+++ b/samples/client/petstore/R/tests/testthat/test_store_api.R
@@ -32,7 +32,7 @@ test_that("GetOrderById", {
   # tests for GetOrderById
   # base path: http://petstore.swagger.io/v2
   # Find purchase order by ID
-  # For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+  # For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
   # @param order.id integer ID of pet that needs to be fetched
   # @return [Order]
 
diff --git a/samples/client/petstore/ada/.openapi-generator-ignore b/samples/client/petstore/ada/.openapi-generator-ignore
index 9b9a09a85889..94b3a421aa47 100644
--- a/samples/client/petstore/ada/.openapi-generator-ignore
+++ b/samples/client/petstore/ada/.openapi-generator-ignore
@@ -5,7 +5,7 @@
 # The patterns follow closely to .gitignore or .dockerignore.
 
 # As an example, the C# client generator defines ApiClient.cs.
-# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+# You can make changes and tell Swagger Codegen to ignore just this file by uncommenting the following line:
 #ApiClient.cs
 
 # You can match any string of characters against a directory, file or extension with a single asterisk (*):
diff --git a/samples/client/petstore/ada/src/client/samples-petstore-clients.adb b/samples/client/petstore/ada/src/client/samples-petstore-clients.adb
index d550af7bbe55..c420821e2e9e 100644
--- a/samples/client/petstore/ada/src/client/samples-petstore-clients.adb
+++ b/samples/client/petstore/ada/src/client/samples-petstore-clients.adb
@@ -184,7 +184,7 @@ package body Samples.Petstore.Clients is
    end Get_Inventory;
 
    --  Find purchase order by ID
-   --  For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   --  For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    procedure Get_Order_By_Id
       (Client : in out Client_Type;
        Order_Id : in Swagger.Long;
diff --git a/samples/client/petstore/ada/src/client/samples-petstore-clients.ads b/samples/client/petstore/ada/src/client/samples-petstore-clients.ads
index ec06fd09d567..d3a8b3fed6f4 100644
--- a/samples/client/petstore/ada/src/client/samples-petstore-clients.ads
+++ b/samples/client/petstore/ada/src/client/samples-petstore-clients.ads
@@ -80,7 +80,7 @@ package Samples.Petstore.Clients is
        Result : out Swagger.Integer_Map);
 
    --  Find purchase order by ID
-   --  For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   --  For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    procedure Get_Order_By_Id
       (Client : in out Client_Type;
        Order_Id : in Swagger.Long;
diff --git a/samples/client/petstore/android/httpclient/docs/StoreApi.md b/samples/client/petstore/android/httpclient/docs/StoreApi.md
index d2229bfd71f4..bb9e7140cc84 100644
--- a/samples/client/petstore/android/httpclient/docs/StoreApi.md
+++ b/samples/client/petstore/android/httpclient/docs/StoreApi.md
@@ -104,7 +104,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/api/StoreApi.java
index 17ad5b2c0840..b0a1f40decce 100644
--- a/samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -150,7 +150,7 @@ public Map  getInventory () throws ApiException {
   }
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    * @param orderId ID of pet that needs to be fetched
    * @return Order
    */
diff --git a/samples/client/petstore/android/volley/docs/StoreApi.md b/samples/client/petstore/android/volley/docs/StoreApi.md
index d2229bfd71f4..bb9e7140cc84 100644
--- a/samples/client/petstore/android/volley/docs/StoreApi.md
+++ b/samples/client/petstore/android/volley/docs/StoreApi.md
@@ -104,7 +104,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/api/StoreApi.java
index fd69b7573487..a2d1f3635c11 100644
--- a/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -297,7 +297,7 @@ public void onErrorResponse(VolleyError error) {
   }
   /**
   * Find purchase order by ID
-  * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+  * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    * @param orderId ID of pet that needs to be fetched
    * @return Order
   */
@@ -359,7 +359,7 @@ public Order getOrderById (Long orderId) throws TimeoutException, ExecutionExcep
 
       /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    * @param orderId ID of pet that needs to be fetched
   */
   public void getOrderById (Long orderId, final Response.Listener responseListener, final Response.ErrorListener errorListener) {
diff --git a/samples/client/petstore/apex/force-app/main/default/classes/OASStoreApi.cls b/samples/client/petstore/apex/force-app/main/default/classes/OASStoreApi.cls
index 8ad6201cd16a..6fdc8415e7d2 100644
--- a/samples/client/petstore/apex/force-app/main/default/classes/OASStoreApi.cls
+++ b/samples/client/petstore/apex/force-app/main/default/classes/OASStoreApi.cls
@@ -72,7 +72,7 @@ public class OASStoreApi {
     }
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched (required)
      * @return OASOrder
      * @throws OAS.ApiException if fails to make API call
diff --git a/samples/client/petstore/apex/force-app/main/default/classes/OASStoreApiTest.cls b/samples/client/petstore/apex/force-app/main/default/classes/OASStoreApiTest.cls
index 548c228a6512..8c1eca4b90a8 100644
--- a/samples/client/petstore/apex/force-app/main/default/classes/OASStoreApiTest.cls
+++ b/samples/client/petstore/apex/force-app/main/default/classes/OASStoreApiTest.cls
@@ -53,7 +53,7 @@ private class OASStoreApiTest {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      */
     @isTest
     private static void getOrderByIdTest() {
diff --git a/samples/client/petstore/async-scala/.openapi-generator-ignore b/samples/client/petstore/async-scala/.openapi-generator-ignore
index c5fa491b4c55..deed424f8a15 100644
--- a/samples/client/petstore/async-scala/.openapi-generator-ignore
+++ b/samples/client/petstore/async-scala/.openapi-generator-ignore
@@ -5,7 +5,7 @@
 # The patterns follow closely to .gitignore or .dockerignore.
 
 # As an example, the C# client generator defines ApiClient.cs.
-# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+# You can make changes and tell Swagger Codegen to ignore just this file by uncommenting the following line:
 #ApiClient.cs
 
 # You can match any string of characters against a directory, file or extension with a single asterisk (*):
diff --git a/samples/client/petstore/bash/client.sh b/samples/client/petstore/bash/client.sh
index 6215aa728ad0..218bee799637 100644
--- a/samples/client/petstore/bash/client.sh
+++ b/samples/client/petstore/bash/client.sh
@@ -24,7 +24,7 @@
 # 
 #
 
-# For improved pattern matching in case statemets
+# For improved pattern matching in case statements
 shopt -s extglob
 
 ###############################################################################
@@ -65,7 +65,7 @@ declare -A header_arguments
 declare -A operation_parameters
 
 ##
-# Declare colors with autodection if output is terminal
+# Declare colors with autodetection if output is terminal
 if [ -t 1 ]; then
     RED="$(tput setaf 1)"
     GREEN="$(tput setaf 2)"
@@ -591,7 +591,7 @@ build_request_path() {
                 parameter_value+="${qparam}=${qvalue}"
             done
         #
-        # Append parameters specified as 'mutli' collections i.e. param=value1¶m=value2&...
+        # Append parameters specified as 'multi' collections i.e. param=value1¶m=value2&...
         #
         elif [[ "${collection_type}" == "multi" ]]; then
             local vcount=0
@@ -802,7 +802,7 @@ echo -e "              \\t\\t\\t\\t(e.g. 'https://petstore.swagger.io')"
     echo -e "         \\t\\t\\t\\trequired parameters or wrong content type"
     echo -e "  --dry-run\\t\\t\\t\\tPrint out the cURL command without"
     echo -e "           \\t\\t\\t\\texecuting it"
-    echo -e "  -nc,--no-colors\\t\\t\\tEnforce print without colors, otherwise autodected"
+    echo -e "  -nc,--no-colors\\t\\t\\tEnforce print without colors, otherwise autodetected"
     echo -e "  -ac,--accept ${YELLOW}${OFF}\\t\\tSet the 'Accept' header in the request"
     echo -e "  -ct,--content-type ${YELLOW}${OFF}\\tSet the 'Content-type' header in "
     echo -e "                                \\tthe request"
@@ -1100,7 +1100,7 @@ print_testGroupParameters_help() {
     echo ""
     echo -e "${BOLD}${WHITE}Responses${OFF}"
     code=400
-    echo -e "${result_color_table[${code:0:1}]}  400;Someting wrong${OFF}" | paste -sd' ' | column -t -s ';' | fold -sw 80 | sed '2,$s/^/       /'
+    echo -e "${result_color_table[${code:0:1}]}  400;Something wrong${OFF}" | paste -sd' ' | column -t -s ';' | fold -sw 80 | sed '2,$s/^/       /'
 }
 ##############################################################################
 #
@@ -1365,7 +1365,7 @@ print_getOrderById_help() {
     echo ""
     echo -e "${BOLD}${WHITE}getOrderById - Find purchase order by ID${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
     echo -e ""
-    echo -e "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions" | paste -sd' ' | fold -sw 80
+    echo -e "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions" | paste -sd' ' | fold -sw 80
     echo -e ""
     echo -e "${BOLD}${WHITE}Parameters${OFF}"
     echo -e "  * ${GREEN}order_id${OFF} ${BLUE}[integer]${OFF} ${RED}(required)${OFF} ${CYAN}(default: null)${OFF} - ID of pet that needs to be fetched ${YELLOW}Specify as: order_id=value${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
@@ -1586,7 +1586,7 @@ call_123Test@$%SpecialTags() {
     #
     # Check if the user provided 'Content-type' headers in the
     # command line. If not try to set them based on the OpenAPI specification
-    # if values produces and consumes are defined unambigously
+    # if values produces and consumes are defined unambiguously
     #
     if [[ -z $header_content_type ]]; then
         header_content_type="application/json"
@@ -1736,7 +1736,7 @@ call_fakeOuterBooleanSerialize() {
     #
     # Check if the user provided 'Content-type' headers in the
     # command line. If not try to set them based on the OpenAPI specification
-    # if values produces and consumes are defined unambigously
+    # if values produces and consumes are defined unambiguously
     #
     if [[ -z $header_content_type ]]; then
         header_content_type="application/json"
@@ -1814,7 +1814,7 @@ call_fakeOuterCompositeSerialize() {
     #
     # Check if the user provided 'Content-type' headers in the
     # command line. If not try to set them based on the OpenAPI specification
-    # if values produces and consumes are defined unambigously
+    # if values produces and consumes are defined unambiguously
     #
     if [[ -z $header_content_type ]]; then
         header_content_type="application/json"
@@ -1892,7 +1892,7 @@ call_fakeOuterNumberSerialize() {
     #
     # Check if the user provided 'Content-type' headers in the
     # command line. If not try to set them based on the OpenAPI specification
-    # if values produces and consumes are defined unambigously
+    # if values produces and consumes are defined unambiguously
     #
     if [[ -z $header_content_type ]]; then
         header_content_type="application/json"
@@ -1970,7 +1970,7 @@ call_fakeOuterStringSerialize() {
     #
     # Check if the user provided 'Content-type' headers in the
     # command line. If not try to set them based on the OpenAPI specification
-    # if values produces and consumes are defined unambigously
+    # if values produces and consumes are defined unambiguously
     #
     if [[ -z $header_content_type ]]; then
         header_content_type="application/json"
@@ -2048,7 +2048,7 @@ call_testBodyWithFileSchema() {
     #
     # Check if the user provided 'Content-type' headers in the
     # command line. If not try to set them based on the OpenAPI specification
-    # if values produces and consumes are defined unambigously
+    # if values produces and consumes are defined unambiguously
     #
     if [[ -z $header_content_type ]]; then
         header_content_type="application/json"
@@ -2126,7 +2126,7 @@ call_testBodyWithQueryParams() {
     #
     # Check if the user provided 'Content-type' headers in the
     # command line. If not try to set them based on the OpenAPI specification
-    # if values produces and consumes are defined unambigously
+    # if values produces and consumes are defined unambiguously
     #
     if [[ -z $header_content_type ]]; then
         header_content_type="application/json"
@@ -2204,7 +2204,7 @@ call_testClientModel() {
     #
     # Check if the user provided 'Content-type' headers in the
     # command line. If not try to set them based on the OpenAPI specification
-    # if values produces and consumes are defined unambigously
+    # if values produces and consumes are defined unambiguously
     #
     if [[ -z $header_content_type ]]; then
         header_content_type="application/json"
@@ -2390,7 +2390,7 @@ call_testInlineAdditionalProperties() {
     #
     # Check if the user provided 'Content-type' headers in the
     # command line. If not try to set them based on the OpenAPI specification
-    # if values produces and consumes are defined unambigously
+    # if values produces and consumes are defined unambiguously
     #
     if [[ -z $header_content_type ]]; then
         header_content_type="application/json"
@@ -2504,7 +2504,7 @@ call_testClassname() {
     #
     # Check if the user provided 'Content-type' headers in the
     # command line. If not try to set them based on the OpenAPI specification
-    # if values produces and consumes are defined unambigously
+    # if values produces and consumes are defined unambiguously
     #
     if [[ -z $header_content_type ]]; then
         header_content_type="application/json"
@@ -2582,7 +2582,7 @@ call_addPet() {
     #
     # Check if the user provided 'Content-type' headers in the
     # command line. If not try to set them based on the OpenAPI specification
-    # if values produces and consumes are defined unambigously
+    # if values produces and consumes are defined unambiguously
     #
 
 
@@ -2802,7 +2802,7 @@ call_updatePet() {
     #
     # Check if the user provided 'Content-type' headers in the
     # command line. If not try to set them based on the OpenAPI specification
-    # if values produces and consumes are defined unambigously
+    # if values produces and consumes are defined unambiguously
     #
 
 
@@ -3094,7 +3094,7 @@ call_placeOrder() {
     #
     # Check if the user provided 'Content-type' headers in the
     # command line. If not try to set them based on the OpenAPI specification
-    # if values produces and consumes are defined unambigously
+    # if values produces and consumes are defined unambiguously
     #
     if [[ -z $header_content_type ]]; then
         header_content_type="application/json"
@@ -3172,7 +3172,7 @@ call_createUser() {
     #
     # Check if the user provided 'Content-type' headers in the
     # command line. If not try to set them based on the OpenAPI specification
-    # if values produces and consumes are defined unambigously
+    # if values produces and consumes are defined unambiguously
     #
     if [[ -z $header_content_type ]]; then
         header_content_type="application/json"
@@ -3250,7 +3250,7 @@ call_createUsersWithArrayInput() {
     #
     # Check if the user provided 'Content-type' headers in the
     # command line. If not try to set them based on the OpenAPI specification
-    # if values produces and consumes are defined unambigously
+    # if values produces and consumes are defined unambiguously
     #
     if [[ -z $header_content_type ]]; then
         header_content_type="application/json"
@@ -3328,7 +3328,7 @@ call_createUsersWithListInput() {
     #
     # Check if the user provided 'Content-type' headers in the
     # command line. If not try to set them based on the OpenAPI specification
-    # if values produces and consumes are defined unambigously
+    # if values produces and consumes are defined unambiguously
     #
     if [[ -z $header_content_type ]]; then
         header_content_type="application/json"
@@ -3550,7 +3550,7 @@ call_updateUser() {
     #
     # Check if the user provided 'Content-type' headers in the
     # command line. If not try to set them based on the OpenAPI specification
-    # if values produces and consumes are defined unambigously
+    # if values produces and consumes are defined unambiguously
     #
     if [[ -z $header_content_type ]]; then
         header_content_type="application/json"
@@ -3812,7 +3812,7 @@ case $key in
     ;;
     *:=*)
     # Parse body arguments and convert them into top level
-    # JSON properties passed in the body content without qoutes
+    # JSON properties passed in the body content without quotes
     if [[ "$operation" ]]; then
         # ignore error about 'sep' being unused
         # shellcheck disable=SC2034
diff --git a/samples/client/petstore/bash/docs/StoreApi.md b/samples/client/petstore/bash/docs/StoreApi.md
index 56b2934562b5..1f43de0867d3 100644
--- a/samples/client/petstore/bash/docs/StoreApi.md
+++ b/samples/client/petstore/bash/docs/StoreApi.md
@@ -82,7 +82,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/bash/petstore-cli b/samples/client/petstore/bash/petstore-cli
index 6810f2afa158..5ffeb5205bbf 100755
--- a/samples/client/petstore/bash/petstore-cli
+++ b/samples/client/petstore/bash/petstore-cli
@@ -1127,7 +1127,7 @@ print_testGroupParameters_help() {
     echo ""
     echo -e "${BOLD}${WHITE}Responses${OFF}"
     code=400
-    echo -e "${result_color_table[${code:0:1}]}  400;Someting wrong${OFF}" | paste -sd' ' | column -t -s ';' | fold -sw 80 | sed '2,$s/^/       /'
+    echo -e "${result_color_table[${code:0:1}]}  400;Something wrong${OFF}" | paste -sd' ' | column -t -s ';' | fold -sw 80 | sed '2,$s/^/       /'
 }
 ##############################################################################
 #
@@ -1425,7 +1425,7 @@ print_getOrderById_help() {
     echo ""
     echo -e "${BOLD}${WHITE}getOrderById - Find purchase order by ID${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
     echo -e ""
-    echo -e "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions" | paste -sd' ' | fold -sw 80
+    echo -e "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions" | paste -sd' ' | fold -sw 80
     echo -e ""
     echo -e "${BOLD}${WHITE}Parameters${OFF}"
     echo -e "  * ${GREEN}order_id${OFF} ${BLUE}[integer]${OFF} ${RED}(required)${OFF} ${CYAN}(default: null)${OFF} - ID of pet that needs to be fetched ${YELLOW}Specify as: order_id=value${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
diff --git a/samples/client/petstore/c/CMakeLists.txt b/samples/client/petstore/c/CMakeLists.txt
index 98454803ef5f..cca11426642a 100644
--- a/samples/client/petstore/c/CMakeLists.txt
+++ b/samples/client/petstore/c/CMakeLists.txt
@@ -66,7 +66,7 @@ set(SRCS "")
 set(HDRS "")
 
 
-## This section shows how to use the above compiled libary to compile the source files
+## This section shows how to use the above compiled library to compile the source files
 ## set source files
 #set(SRCS
 #    unit-tests/manual-PetAPI.c
@@ -81,12 +81,12 @@ set(HDRS "")
 
 ## loop over all files in SRCS variable
 #foreach(SOURCE_FILE ${SRCS})
-#    # Get only the file name from the file as add_executable doesnot support executable with slash("/")
+#    # Get only the file name from the file as add_executable doesn't support executable with slash("/")
 #    get_filename_component(FILE_NAME_ONLY ${SOURCE_FILE} NAME_WE)
 #    # Remove .c from the file name and set it as executable name
 #    string( REPLACE ".c" "" EXECUTABLE_FILE ${FILE_NAME_ONLY})
 #    # Add executable for every source file in  SRCS
 #    add_executable(unit-${EXECUTABLE_FILE} ${SOURCE_FILE})
-#    # Link above created libary to executable and dependent libary curl
+#    # Link above created library to executable and dependent library curl
 #    target_link_libraries(unit-${EXECUTABLE_FILE} ${CURL_LIBRARIES} ${pkgName} )
 #endforeach(SOURCE_FILE ${SRCS})
diff --git a/samples/client/petstore/c/api/StoreAPI.c b/samples/client/petstore/c/api/StoreAPI.c
index 3208b8ae53a2..c91a9d709dcf 100644
--- a/samples/client/petstore/c/api/StoreAPI.c
+++ b/samples/client/petstore/c/api/StoreAPI.c
@@ -144,7 +144,7 @@ StoreAPI_getInventory(apiClient_t *apiClient)
 
 // Find purchase order by ID
 //
-// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 //
 order_t*
 StoreAPI_getOrderById(apiClient_t *apiClient, long orderId )
diff --git a/samples/client/petstore/c/api/StoreAPI.h b/samples/client/petstore/c/api/StoreAPI.h
index 43bdf7583767..99e4f25d37dd 100644
--- a/samples/client/petstore/c/api/StoreAPI.h
+++ b/samples/client/petstore/c/api/StoreAPI.h
@@ -26,7 +26,7 @@ StoreAPI_getInventory(apiClient_t *apiClient);
 
 // Find purchase order by ID
 //
-// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 //
 order_t*
 StoreAPI_getOrderById(apiClient_t *apiClient, long orderId );
diff --git a/samples/client/petstore/c/docs/StoreAPI.md b/samples/client/petstore/c/docs/StoreAPI.md
index 3c6736897ec4..45462990e055 100644
--- a/samples/client/petstore/c/docs/StoreAPI.md
+++ b/samples/client/petstore/c/docs/StoreAPI.md
@@ -77,7 +77,7 @@ list_t*
 ```c
 // Find purchase order by ID
 //
-// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 //
 order_t* StoreAPI_getOrderById(apiClient_t *apiClient, long orderId);
 ```
diff --git a/samples/client/petstore/c/external/cJSON.c b/samples/client/petstore/c/external/cJSON.c
index 2139b5efd936..afc9ff0db8b2 100644
--- a/samples/client/petstore/c/external/cJSON.c
+++ b/samples/client/petstore/c/external/cJSON.c
@@ -125,7 +125,7 @@ typedef struct internal_hooks
 } internal_hooks;
 
 #if defined(_MSC_VER)
-/* work around MSVC error C2322: '...' address of dillimport '...' is not static */
+/* work around MSVC error C2322: '...' address of dllimport '...' is not static */
 static void *internal_malloc(size_t size)
 {
     return malloc(size);
diff --git a/samples/client/petstore/c/unit-tests/manual-user.c b/samples/client/petstore/c/unit-tests/manual-user.c
index 738b21e22b2a..1200baa2e5d2 100644
--- a/samples/client/petstore/c/unit-tests/manual-user.c
+++ b/samples/client/petstore/c/unit-tests/manual-user.c
@@ -24,16 +24,16 @@ int main() {
 
 	printf("Created User is: \n%s\n", dataToPrint);
 
-	user_t *pasrsedUser = user_parseFromJSON(JSONNODE);
+	user_t *parsedUser = user_parseFromJSON(JSONNODE);
 
-	cJSON *fromJSON = user_convertToJSON(pasrsedUser);
+	cJSON *fromJSON = user_convertToJSON(parsedUser);
 
 	char *dataToPrintFromJSON = cJSON_Print(fromJSON);
 
 	printf("Parsed User From JSON is: \n%s\n", dataToPrintFromJSON);
 
 	user_free(newuser);
-	user_free(pasrsedUser);
+	user_free(parsedUser);
 	cJSON_Delete(JSONNODE);
 	cJSON_Delete(fromJSON);
 }
diff --git a/samples/client/petstore/clojure/git_push.sh b/samples/client/petstore/clojure/git_push.sh
index 8442b80bb445..f8c12cff4894 100644
--- a/samples/client/petstore/clojure/git_push.sh
+++ b/samples/client/petstore/clojure/git_push.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update"
 
 git_user_id=$1
 git_repo_id=$2
diff --git a/samples/client/petstore/clojure/src/open_api_petstore/api/store.clj b/samples/client/petstore/clojure/src/open_api_petstore/api/store.clj
index a91c086c3fd4..f47fa3d69f9d 100644
--- a/samples/client/petstore/clojure/src/open_api_petstore/api/store.clj
+++ b/samples/client/petstore/clojure/src/open_api_petstore/api/store.clj
@@ -61,7 +61,7 @@
 
 (defn-spec get-order-by-id-with-http-info any?
   "Find purchase order by ID
-  For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions"
+  For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions"
   [orderId string?]
   (check-required-params orderId)
   (call-api "/store/order/{orderId}" :get
@@ -75,7 +75,7 @@
 
 (defn-spec get-order-by-id order-spec
   "Find purchase order by ID
-  For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions"
+  For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions"
   [orderId string?]
   (let [res (:data (get-order-by-id-with-http-info orderId))]
     (if (:decode-models *api-context*)
diff --git a/samples/client/petstore/clojure/src/open_api_petstore/core.clj b/samples/client/petstore/clojure/src/open_api_petstore/core.clj
index ef30d6d25161..7c5e0def9496 100644
--- a/samples/client/petstore/clojure/src/open_api_petstore/core.clj
+++ b/samples/client/petstore/clojure/src/open_api_petstore/core.clj
@@ -105,7 +105,7 @@
     :else (str param)))
 
 (defn auth->opts
-  "Process the given auth to an option map that might conatin request options and parameters."
+  "Process the given auth to an option map that might contain request options and parameters."
   [{:keys [type in param-name]} value]
   (case type
     :basic {:req-opts {:basic-auth value}}
@@ -126,7 +126,7 @@
     opts))
 
 (defn auths->opts
-  "Process the given auth names to an option map that might conatin request options and parameters."
+  "Process the given auth names to an option map that might contain request options and parameters."
   [auth-names]
   (reduce process-auth {} auth-names))
 
@@ -142,7 +142,7 @@
     (str (:base-url *api-context*) path)))
 
 (defn normalize-array-param
-  "Normalize array paramater according to :collection-format specified in the parameter's meta data.
+  "Normalize array parameter according to :collection-format specified in the parameter's meta data.
   When the parameter contains File, a seq is returned so as to keep File parameters.
   For :multi collection format, a seq is returned which will be handled properly by clj-http.
   For other cases, a string is returned."
diff --git a/samples/client/petstore/cpp-qt/build-and-test.bash b/samples/client/petstore/cpp-qt/build-and-test.bash
index bcf96489533f..4104bdac1bc7 100755
--- a/samples/client/petstore/cpp-qt/build-and-test.bash
+++ b/samples/client/petstore/cpp-qt/build-and-test.bash
@@ -35,7 +35,7 @@ else
     exit 1
   fi
 
-  echo "Check if no memory leaks occured:"
+  echo "Check if no memory leaks occurred:"
   leakCount=$(cat result.log | grep 'lost: 0 bytes in 0 blocks' | wc -l)
   if [ $leakCount == 3 ]
   then
diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/api/StoreApi.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/api/StoreApi.h
index 5140fc90a793..57496ef7dd25 100644
--- a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/api/StoreApi.h
+++ b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/api/StoreApi.h
@@ -66,7 +66,7 @@ class  StoreApi
     /// Find purchase order by ID
     /// 
     /// 
-    /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
     /// 
     /// ID of pet that needs to be fetched
     pplx::task> getOrderById(
diff --git a/samples/client/petstore/cpp-tiny/lib/service/StoreApi.h b/samples/client/petstore/cpp-tiny/lib/service/StoreApi.h
index b7a6781bd429..dd29c9f96e1e 100644
--- a/samples/client/petstore/cpp-tiny/lib/service/StoreApi.h
+++ b/samples/client/petstore/cpp-tiny/lib/service/StoreApi.h
@@ -51,7 +51,7 @@ class StoreApi : public Service {
     /**
     * Find purchase order by ID.
     *
-    * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
     * \param orderId ID of pet that needs to be fetched *Required*
     */
     Response<
diff --git a/samples/client/petstore/cpp-tizen/doc/Doxyfile b/samples/client/petstore/cpp-tizen/doc/Doxyfile
index 9a0ba8f71860..8d056fd3d458 100644
--- a/samples/client/petstore/cpp-tizen/doc/Doxyfile
+++ b/samples/client/petstore/cpp-tizen/doc/Doxyfile
@@ -294,7 +294,7 @@ MARKDOWN_SUPPORT       = YES
 
 # When enabled doxygen tries to link words that correspond to documented
 # classes, or namespaces to their corresponding documentation. Such a link can
-# be prevented in individual cases by by putting a % sign in front of the word
+# be prevented in individual cases by putting a % sign in front of the word
 # or globally by setting AUTOLINK_SUPPORT to NO.
 # The default value is: YES.
 
@@ -1397,7 +1397,7 @@ EXT_LINKS_IN_WINDOW    = NO
 
 FORMULA_FONTSIZE       = 10
 
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# Use the FORMULA_TRANSPARENT tag to determine whether or not the images
 # generated for formulas are transparent PNGs. Transparent PNGs are not
 # supported properly for IE 6.0, but are supported on all modern browsers.
 #
diff --git a/samples/client/petstore/cpp-tizen/src/StoreManager.h b/samples/client/petstore/cpp-tizen/src/StoreManager.h
index 9736475b3810..7db3e783bba3 100644
--- a/samples/client/petstore/cpp-tizen/src/StoreManager.h
+++ b/samples/client/petstore/cpp-tizen/src/StoreManager.h
@@ -79,7 +79,7 @@ bool getInventoryAsync(char * accessToken,
 
 /*! \brief Find purchase order by ID. *Synchronous*
  *
- * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+ * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
  * \param orderId ID of pet that needs to be fetched *Required*
  * \param handler The callback function to be invoked on completion. *Required*
  * \param accessToken The Authorization token. *Required*
@@ -92,7 +92,7 @@ bool getOrderByIdSync(char * accessToken,
 
 /*! \brief Find purchase order by ID. *Asynchronous*
  *
- * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+ * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
  * \param orderId ID of pet that needs to be fetched *Required*
  * \param handler The callback function to be invoked on completion. *Required*
  * \param accessToken The Authorization token. *Required*
diff --git a/samples/client/petstore/cpp-ue4/Public/OpenAPIStoreApiOperations.h b/samples/client/petstore/cpp-ue4/Public/OpenAPIStoreApiOperations.h
index e0703baa3afc..9df366173a3b 100644
--- a/samples/client/petstore/cpp-ue4/Public/OpenAPIStoreApiOperations.h
+++ b/samples/client/petstore/cpp-ue4/Public/OpenAPIStoreApiOperations.h
@@ -70,7 +70,7 @@ class OPENAPI_API OpenAPIStoreApi::GetInventoryResponse : public Response
 
 /* Find purchase order by ID
  *
- * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+ * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 */
 class OPENAPI_API OpenAPIStoreApi::GetOrderByIdRequest : public Request
 {
diff --git a/samples/client/petstore/crystal/spec/api/store_api_spec.cr b/samples/client/petstore/crystal/spec/api/store_api_spec.cr
index 592747d6fe7b..05fd3146d882 100644
--- a/samples/client/petstore/crystal/spec/api/store_api_spec.cr
+++ b/samples/client/petstore/crystal/spec/api/store_api_spec.cr
@@ -48,7 +48,7 @@ describe "StoreApi" do
 
   # unit tests for get_order_by_id
   # Find purchase order by ID
-  # For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+  # For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
   # @param order_id ID of pet that needs to be fetched
   # @param [Hash] opts the optional parameters
   # @return [Order]
diff --git a/samples/client/petstore/crystal/src/petstore/api/store_api.cr b/samples/client/petstore/crystal/src/petstore/api/store_api.cr
index f24fae790333..76d3c836d9a1 100644
--- a/samples/client/petstore/crystal/src/petstore/api/store_api.cr
+++ b/samples/client/petstore/crystal/src/petstore/api/store_api.cr
@@ -128,7 +128,7 @@ module Petstore
     end
 
     # Find purchase order by ID
-    # For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    # For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
     # @param order_id [Int64] ID of pet that needs to be fetched
     # @return [Order]
     def get_order_by_id(order_id : Int64)
@@ -137,7 +137,7 @@ module Petstore
     end
 
     # Find purchase order by ID
-    # For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    # For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
     # @param order_id [Int64] ID of pet that needs to be fetched
     # @return [Array<(Order, Integer, Hash)>] Order data, response status code and response headers
     def get_order_by_id_with_http_info(order_id : Int64)
diff --git a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/StoreApi.md b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/StoreApi.md
index 068cb5419f84..d68fa5efb813 100644
--- a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/StoreApi.md
+++ b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/docs/StoreApi.md
@@ -138,7 +138,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```csharp
diff --git a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Api/StoreApi.cs
index df7be44e7b95..423d179cdbe3 100644
--- a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Api/StoreApi.cs
@@ -23,7 +23,7 @@ public interface IStoreApi
         /// Dictionary<string, int?>
         Dictionary GetInventory ();
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// ID of pet that needs to be fetched
         /// Order
@@ -159,7 +159,7 @@ public void DeleteOrder (string orderId)
         }
     
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// ID of pet that needs to be fetched 
         /// Order            
diff --git a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Client/ApiClient.cs
index e1d91307dcfe..7b0d472a06ed 100644
--- a/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Client/ApiClient.cs
+++ b/samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient/src/main/CsharpDotNet2/Org/OpenAPITools/Client/ApiClient.cs
@@ -14,7 +14,7 @@
 namespace Org.OpenAPITools.Client
 {
     /// 
-    /// API client is mainly responible for making the HTTP call to the API backend.
+    /// API client is mainly responsible for making the HTTP call to the API backend.
     /// 
     public class ApiClient
     {
diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/StoreApi.md b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/StoreApi.md
index 76334b0ca4dc..58e85fb6eb64 100644
--- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/StoreApi.md
+++ b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/StoreApi.md
@@ -140,7 +140,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```csharp
diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Api/StoreApi.cs
index 3390bbbcaba7..c23c321d6371 100644
--- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Api/StoreApi.cs
@@ -23,7 +23,7 @@ public interface IStoreApi
         /// Dictionary<string, int?>
         Dictionary GetInventory ();
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// ID of pet that needs to be fetched
         /// Order
@@ -159,7 +159,7 @@ public void DeleteOrder (string orderId)
         }
     
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// ID of pet that needs to be fetched 
         /// Order            
diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Client/ApiClient.cs
index 095f97997ec3..5903fde02ad2 100644
--- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Client/ApiClient.cs
+++ b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Client/ApiClient.cs
@@ -14,7 +14,7 @@
 namespace Org.OpenAPITools.Client
 {
     /// 
-    /// API client is mainly responible for making the HTTP call to the API backend.
+    /// API client is mainly responsible for making the HTTP call to the API backend.
     /// 
     public class ApiClient
     {
diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Client/Configuration.cs
index 8cac9c7d9db5..7546607fa992 100644
--- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Client/Configuration.cs
+++ b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/Org/OpenAPITools/Client/Configuration.cs
@@ -84,7 +84,7 @@ public static String TempFolderPath
         private static string _dateTimeFormat = ISO8601_DATETIME_FORMAT;
 
         /// 
-        /// Gets or sets the the date time format used when serializing in the ApiClient
+        /// Gets or sets the date time format used when serializing in the ApiClient
         /// By default, it's set to ISO 8601 - "o", for others see:
         /// https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx
         /// and https://msdn.microsoft.com/en-us/library/8kb3ddd4(v=vs.110).aspx
diff --git a/samples/client/petstore/csharp-netcore-functions/generatedSrc/Client/ApiClient.cs b/samples/client/petstore/csharp-netcore-functions/generatedSrc/Client/ApiClient.cs
index 4f68a59871e7..fe4dcf5a24da 100644
--- a/samples/client/petstore/csharp-netcore-functions/generatedSrc/Client/ApiClient.cs
+++ b/samples/client/petstore/csharp-netcore-functions/generatedSrc/Client/ApiClient.cs
@@ -157,7 +157,7 @@ public string ContentType
         }
     }
     /// 
-    /// Provides a default implementation of an Api client (both synchronous and asynchronous implementatios),
+    /// Provides a default implementation of an Api client (both synchronous and asynchronous implementations),
     /// encapsulating general REST accessor use cases.
     /// 
     public partial class ApiClient : ISynchronousClient, IAsynchronousClient
@@ -166,7 +166,7 @@ public partial class ApiClient : ISynchronousClient, IAsynchronousClient
 
         /// 
         /// Specifies the settings on a  object.
-        /// These settings can be adjusted to accomodate custom serialization rules.
+        /// These settings can be adjusted to accommodate custom serialization rules.
         /// 
         public JsonSerializerSettings SerializerSettings { get; set; } = new JsonSerializerSettings
         {
diff --git a/samples/client/petstore/csharp-netcore-functions/generatedSrc/Client/Configuration.cs b/samples/client/petstore/csharp-netcore-functions/generatedSrc/Client/Configuration.cs
index 896bd754ea5f..897d5a1c666a 100644
--- a/samples/client/petstore/csharp-netcore-functions/generatedSrc/Client/Configuration.cs
+++ b/samples/client/petstore/csharp-netcore-functions/generatedSrc/Client/Configuration.cs
@@ -71,7 +71,7 @@ public class Configuration : IReadableConfiguration
 
         /// 
         /// Gets or sets the API key based on the authentication name.
-        /// This is the key and value comprising the "secret" for acessing an API.
+        /// This is the key and value comprising the "secret" for accessing an API.
         /// 
         /// The API key.
         private IDictionary _apiKey;
@@ -425,7 +425,7 @@ public string GetServerUrl(int index, Dictionary inputVariables)
                 }
                 else
                 {
-                    // use defualt value
+                    // use default value
                     url = url.Replace("{" + variable.Key + "}", (string)serverVariables["default_value"]);
                 }
             }
diff --git a/samples/client/petstore/csharp-netcore-functions/git_push.sh b/samples/client/petstore/csharp-netcore-functions/git_push.sh
index ced3be2b0c7b..200e975d2120 100644
--- a/samples/client/petstore/csharp-netcore-functions/git_push.sh
+++ b/samples/client/petstore/csharp-netcore-functions/git_push.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update" "gitlab.com"
 
 git_user_id=$1
 git_repo_id=$2
diff --git a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/ApiClient.cs
index 4f68a59871e7..fe4dcf5a24da 100644
--- a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/ApiClient.cs
+++ b/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/ApiClient.cs
@@ -157,7 +157,7 @@ public string ContentType
         }
     }
     /// 
-    /// Provides a default implementation of an Api client (both synchronous and asynchronous implementatios),
+    /// Provides a default implementation of an Api client (both synchronous and asynchronous implementations),
     /// encapsulating general REST accessor use cases.
     /// 
     public partial class ApiClient : ISynchronousClient, IAsynchronousClient
@@ -166,7 +166,7 @@ public partial class ApiClient : ISynchronousClient, IAsynchronousClient
 
         /// 
         /// Specifies the settings on a  object.
-        /// These settings can be adjusted to accomodate custom serialization rules.
+        /// These settings can be adjusted to accommodate custom serialization rules.
         /// 
         public JsonSerializerSettings SerializerSettings { get; set; } = new JsonSerializerSettings
         {
diff --git a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/Configuration.cs
index 896bd754ea5f..897d5a1c666a 100644
--- a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/Configuration.cs
+++ b/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/Configuration.cs
@@ -71,7 +71,7 @@ public class Configuration : IReadableConfiguration
 
         /// 
         /// Gets or sets the API key based on the authentication name.
-        /// This is the key and value comprising the "secret" for acessing an API.
+        /// This is the key and value comprising the "secret" for accessing an API.
         /// 
         /// The API key.
         private IDictionary _apiKey;
@@ -425,7 +425,7 @@ public string GetServerUrl(int index, Dictionary inputVariables)
                 }
                 else
                 {
-                    // use defualt value
+                    // use default value
                     url = url.Replace("{" + variable.Key + "}", (string)serverVariables["default_value"]);
                 }
             }
diff --git a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
index 00bedba8ee28..cd8f3fdb1f37 100644
--- a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
+++ b/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
@@ -47,7 +47,7 @@ public interface IReadableConfiguration
         /// 
         /// Gets the date time format.
         /// 
-        /// Date time foramt.
+        /// Date time format.
         string DateTimeFormat { get; }
 
         /// 
diff --git a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/RequestOptions.cs
index c6b3ccc38f22..a6377408779c 100644
--- a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/RequestOptions.cs
+++ b/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/RequestOptions.cs
@@ -33,7 +33,7 @@ public class RequestOptions
         public Multimap QueryParameters { get; set; }
 
         /// 
-        /// Header parameters to be applied to to the request.
+        /// Header parameters to be applied to the request.
         /// Keys may have 1 or more values associated.
         /// 
         public Multimap HeaderParameters { get; set; }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/FakeApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/FakeApi.md
index 46d135e359f8..212d1d35c49b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/FakeApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/FakeApi.md
@@ -1121,7 +1121,7 @@ void (empty response body)
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 [[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)
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/StoreApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/StoreApi.md
index 95bbe1b2f13f..de4414feafc5 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/StoreApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/StoreApi.md
@@ -194,7 +194,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```csharp
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/StoreApi.cs
index e01ed1625899..e8bed0a150ec 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/StoreApi.cs
@@ -75,7 +75,7 @@ public interface IStoreApiSync : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -87,7 +87,7 @@ public interface IStoreApiSync : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -175,7 +175,7 @@ public interface IStoreApiAsync : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -188,7 +188,7 @@ public interface IStoreApiAsync : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -618,7 +618,7 @@ public Org.OpenAPITools.Client.ApiResponse> GetInventory
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -631,7 +631,7 @@ public Order GetOrderById(long orderId, int operationIndex = 0)
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -683,7 +683,7 @@ public Org.OpenAPITools.Client.ApiResponse GetOrderByIdWithHttpInfo(long
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -697,7 +697,7 @@ public Org.OpenAPITools.Client.ApiResponse GetOrderByIdWithHttpInfo(long
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/RequestOptions.cs
index 4c26cf69b24d..f5e02e93f0f9 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/RequestOptions.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/RequestOptions.cs
@@ -33,7 +33,7 @@ public class RequestOptions
         public Multimap QueryParameters { get; set; }
 
         /// 
-        /// Header parameters to be applied to to the request.
+        /// Header parameters to be applied to the request.
         /// Keys may have 1 or more values associated.
         /// 
         public Multimap HeaderParameters { get; set; }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/README.md
index 2ecf1cd41c80..b2a159fd0a93 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/README.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/README.md
@@ -216,7 +216,7 @@ Authentication schemes defined for the API:
 - modelTests: true
 - withXml: 
 
-## [OpenApi Generator Parameteres](https://openapi-generator.tech/docs/generators/csharp-netcore)
+## [OpenApi Generator Parameters](https://openapi-generator.tech/docs/generators/csharp-netcore)
 - allowUnicodeIdentifiers: 
 - apiName: Api
 - caseInsensitiveResponseHeaders: 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/FakeApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/FakeApi.md
index c1202fdbf367..a179355d603f 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/FakeApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/FakeApi.md
@@ -1121,7 +1121,7 @@ void (empty response body)
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 [[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)
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/StoreApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/StoreApi.md
index 04c9407eb43b..aa0a568fc528 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/StoreApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/StoreApi.md
@@ -194,7 +194,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```csharp
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/scripts/git_push.ps1 b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/scripts/git_push.ps1
index 0a2d4e52280a..73ed35c2bb10 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/scripts/git_push.ps1
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/scripts/git_push.ps1
@@ -49,7 +49,7 @@ Set-StrictMode -Version 3.0
 if ($Help){
     Write-Output "
     This script will initialize a git repository, then add and commit all files.
-    The local repository will then be pushed to your prefered git provider.
+    The local repository will then be pushed to your preferred git provider.
     If the remote repository does not exist yet and you are using GitHub,
     the repository will be created for you provided you have the GitHub CLI installed.
     
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
index 7c19f93d3d81..87be0ad41e07 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
@@ -240,7 +240,7 @@ public AnotherFakeApi(ILogger logger, HttpClient httpClient, Jso
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -255,7 +255,7 @@ public AnotherFakeApi(ILogger logger, HttpClient httpClient, Jso
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }    }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/DefaultApi.cs
index 1f9ed0913df2..74a3ab0165de 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/DefaultApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/DefaultApi.cs
@@ -214,7 +214,7 @@ public DefaultApi(ILogger logger, HttpClient httpClient, JsonSeriali
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -229,7 +229,7 @@ public DefaultApi(ILogger logger, HttpClient httpClient, JsonSeriali
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }    }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeApi.cs
index da538a367ba5..56d7a03ec388 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -808,7 +808,7 @@ public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -823,7 +823,7 @@ public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -927,7 +927,7 @@ public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -942,7 +942,7 @@ public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1046,7 +1046,7 @@ public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1061,7 +1061,7 @@ public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1165,7 +1165,7 @@ public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1180,7 +1180,7 @@ public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1284,7 +1284,7 @@ public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1299,7 +1299,7 @@ public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1387,7 +1387,7 @@ public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1402,7 +1402,7 @@ public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1504,7 +1504,7 @@ public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1519,7 +1519,7 @@ public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1633,7 +1633,7 @@ public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1648,7 +1648,7 @@ public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1759,7 +1759,7 @@ public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1774,7 +1774,7 @@ public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1974,7 +1974,7 @@ public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1992,7 +1992,7 @@ public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -2139,7 +2139,7 @@ public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -2154,7 +2154,7 @@ public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -2290,7 +2290,7 @@ public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -2308,7 +2308,7 @@ public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -2410,7 +2410,7 @@ public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -2425,7 +2425,7 @@ public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -2541,7 +2541,7 @@ public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -2556,7 +2556,7 @@ public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -2679,7 +2679,7 @@ public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -2694,7 +2694,7 @@ public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }    }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
index c73a45013662..631e6abe1542 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
@@ -252,7 +252,7 @@ public FakeClassnameTags123Api(ILogger logger, HttpClie
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -270,7 +270,7 @@ public FakeClassnameTags123Api(ILogger logger, HttpClie
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }    }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/PetApi.cs
index d54ddb22b1d4..b86139fcd5fc 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/PetApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/PetApi.cs
@@ -557,7 +557,7 @@ public PetApi(ILogger logger, HttpClient httpClient, JsonSerializerOptio
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -578,7 +578,7 @@ public PetApi(ILogger logger, HttpClient httpClient, JsonSerializerOptio
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -682,7 +682,7 @@ public PetApi(ILogger logger, HttpClient httpClient, JsonSerializerOptio
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -700,7 +700,7 @@ public PetApi(ILogger logger, HttpClient httpClient, JsonSerializerOptio
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -821,7 +821,7 @@ public PetApi(ILogger logger, HttpClient httpClient, JsonSerializerOptio
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -842,7 +842,7 @@ public PetApi(ILogger logger, HttpClient httpClient, JsonSerializerOptio
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -963,7 +963,7 @@ public PetApi(ILogger logger, HttpClient httpClient, JsonSerializerOptio
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -984,7 +984,7 @@ public PetApi(ILogger logger, HttpClient httpClient, JsonSerializerOptio
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1092,7 +1092,7 @@ public PetApi(ILogger logger, HttpClient httpClient, JsonSerializerOptio
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1110,7 +1110,7 @@ public PetApi(ILogger logger, HttpClient httpClient, JsonSerializerOptio
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1229,7 +1229,7 @@ public PetApi(ILogger logger, HttpClient httpClient, JsonSerializerOptio
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1250,7 +1250,7 @@ public PetApi(ILogger logger, HttpClient httpClient, JsonSerializerOptio
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1377,7 +1377,7 @@ public PetApi(ILogger logger, HttpClient httpClient, JsonSerializerOptio
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1395,7 +1395,7 @@ public PetApi(ILogger logger, HttpClient httpClient, JsonSerializerOptio
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1531,7 +1531,7 @@ public PetApi(ILogger logger, HttpClient httpClient, JsonSerializerOptio
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1549,7 +1549,7 @@ public PetApi(ILogger logger, HttpClient httpClient, JsonSerializerOptio
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1688,7 +1688,7 @@ public PetApi(ILogger logger, HttpClient httpClient, JsonSerializerOptio
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1706,7 +1706,7 @@ public PetApi(ILogger logger, HttpClient httpClient, JsonSerializerOptio
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }    }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/StoreApi.cs
index d09c3633b59c..1d07247d8e6f 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/StoreApi.cs
@@ -101,7 +101,7 @@ public interface IStoreApi : IApi
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -113,7 +113,7 @@ public interface IStoreApi : IApi
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -125,7 +125,7 @@ public interface IStoreApi : IApi
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// ID of pet that needs to be fetched
         /// Cancellation Token to cancel the request.
@@ -324,7 +324,7 @@ public StoreApi(ILogger logger, HttpClient httpClient, JsonSerializerO
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -339,7 +339,7 @@ public StoreApi(ILogger logger, HttpClient httpClient, JsonSerializerO
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -435,7 +435,7 @@ public StoreApi(ILogger logger, HttpClient httpClient, JsonSerializerO
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -453,13 +453,13 @@ public StoreApi(ILogger logger, HttpClient httpClient, JsonSerializerO
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -476,7 +476,7 @@ public StoreApi(ILogger logger, HttpClient httpClient, JsonSerializerO
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -499,7 +499,7 @@ public StoreApi(ILogger logger, HttpClient httpClient, JsonSerializerO
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -553,7 +553,7 @@ public StoreApi(ILogger logger, HttpClient httpClient, JsonSerializerO
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -568,7 +568,7 @@ public StoreApi(ILogger logger, HttpClient httpClient, JsonSerializerO
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -680,7 +680,7 @@ public StoreApi(ILogger logger, HttpClient httpClient, JsonSerializerO
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -695,7 +695,7 @@ public StoreApi(ILogger logger, HttpClient httpClient, JsonSerializerO
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }    }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/UserApi.cs
index 8e886e254d90..1d51468c105f 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/UserApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/UserApi.cs
@@ -486,7 +486,7 @@ public UserApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -501,7 +501,7 @@ public UserApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -603,7 +603,7 @@ public UserApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -618,7 +618,7 @@ public UserApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -720,7 +720,7 @@ public UserApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -735,7 +735,7 @@ public UserApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -825,7 +825,7 @@ public UserApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -840,7 +840,7 @@ public UserApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -940,7 +940,7 @@ public UserApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -955,7 +955,7 @@ public UserApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1067,7 +1067,7 @@ public UserApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1082,7 +1082,7 @@ public UserApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1161,7 +1161,7 @@ public UserApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1176,7 +1176,7 @@ public UserApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1285,7 +1285,7 @@ public UserApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1300,7 +1300,7 @@ public UserApi(ILogger logger, HttpClient httpClient, JsonSerializerOpt
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }    }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiException.cs
index 067639ab9ff2..76274524017f 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiException.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiException.cs
@@ -35,7 +35,7 @@ public class ApiException : Exception
         public string RawContent { get; }
         
         /// 
-        /// Construct the ApiException from parts of the reponse
+        /// Construct the ApiException from parts of the response
         /// 
         /// 
         /// 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiResponse`1.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiResponse`1.cs
index 78a0047905cf..36696f85be39 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiResponse`1.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiResponse`1.cs
@@ -87,7 +87,7 @@ public Type ResponseType
         #endregion Properties
 
         /// 
-        /// Construct the reponse using an HttpResponseMessage
+        /// Construct the response using an HttpResponseMessage
         /// 
         /// 
         /// 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
index 0c4101dd74a2..eb4b80c87416 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
@@ -196,7 +196,7 @@ internal Dictionary GetHttpSignedHeader(System.Net.Http.HttpRequ
             foreach (var keyVal in httpSignatureHeader)
                 headerValuesList.Add(string.Format("{0}: {1}", keyVal.Key, keyVal.Value));
 
-            //Concatinate headers value separated by new line
+            //Concatenate headers value separated by new line
             var headerValuesString = string.Join("\n", headerValuesList);
             var signatureStringHash = GetStringHash(HashAlgorithm.ToString(), headerValuesString);
             string? headerSignatureStr = null;
@@ -324,7 +324,7 @@ private string GetECDSASignature(byte[] dataToSign)
         private  byte[] ConvertToECDSAANS1Format(byte[] signedBytes)
         {
             var derBytes = new List();
-            byte derLength = 68; //default lenght for ECDSA code signinged bit 0x44
+            byte derLength = 68; //default length for ECDSA code signing bit 0x44
             byte rbytesLength = 32; //R length 0x20
             byte sbytesLength = 32; //S length 0x20
             var rBytes = new List();
@@ -359,7 +359,7 @@ private  byte[] ConvertToECDSAANS1Format(byte[] signedBytes)
             }
 
             derBytes.Add(48);  //start of the sequence 0x30
-            derBytes.Add(derLength);  //total length r lenth, type and r bytes
+            derBytes.Add(derLength);  //total length r length, type and r bytes
 
             derBytes.Add(2); //tag for integer
             derBytes.Add(rbytesLength); //length of r
@@ -371,7 +371,7 @@ private  byte[] ConvertToECDSAANS1Format(byte[] signedBytes)
             return derBytes.ToArray();
         }
 
-        private  RSACryptoServiceProvider? GetRSAProviderFromPemFile(String pemfile, SecureString? keyPassPharse = null)
+        private  RSACryptoServiceProvider? GetRSAProviderFromPemFile(String pemfile, SecureString? keyPassPhrase = null)
         {
             const String pempubheader = "-----BEGIN PUBLIC KEY-----";
             const String pempubfooter = "-----END PUBLIC KEY-----";
@@ -388,7 +388,7 @@ private  byte[] ConvertToECDSAANS1Format(byte[] signedBytes)
 
             if (isPrivateKeyFile)
             {
-                pemkey = ConvertPrivateKeyToBytes(pemstr, keyPassPharse);
+                pemkey = ConvertPrivateKeyToBytes(pemstr, keyPassPhrase);
 
                 if (pemkey == null)
                     return null;
@@ -398,7 +398,7 @@ private  byte[] ConvertToECDSAANS1Format(byte[] signedBytes)
             return null;
         }
 
-        private byte[]? ConvertPrivateKeyToBytes(String instr, SecureString? keyPassPharse = null)
+        private byte[]? ConvertPrivateKeyToBytes(String instr, SecureString? keyPassPhrase = null)
         {
             const String pemprivheader = "-----BEGIN RSA PRIVATE KEY-----";
             const String pemprivfooter = "-----END RSA PRIVATE KEY-----";
@@ -446,12 +446,12 @@ private  byte[] ConvertToECDSAANS1Format(byte[] signedBytes)
                     binkey = Convert.FromBase64String(encryptedstr);
                 }
                 catch (System.FormatException)
-                {   //data is not in base64 fromat
+                {   //data is not in base64 format
                     return null;
                 }
 
-                // TODO: what do we do here if keyPassPharse is null?
-                byte[] deskey = GetEncryptedKey(salt, keyPassPharse!, 1, 2);    // count=1 (for OpenSSL implementation); 2 iterations to get at least 24 bytes
+                // TODO: what do we do here if keyPassPhrase is null?
+                byte[] deskey = GetEncryptedKey(salt, keyPassPhrase!, 1, 2);    // count=1 (for OpenSSL implementation); 2 iterations to get at least 24 bytes
                 if (deskey == null)
                     return null;
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/README.md
index c109d03e6ffe..6c332bb5d1bd 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/README.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/README.md
@@ -216,7 +216,7 @@ Authentication schemes defined for the API:
 - modelTests: true
 - withXml: 
 
-## [OpenApi Generator Parameteres](https://openapi-generator.tech/docs/generators/csharp-netcore)
+## [OpenApi Generator Parameters](https://openapi-generator.tech/docs/generators/csharp-netcore)
 - allowUnicodeIdentifiers: 
 - apiName: Api
 - caseInsensitiveResponseHeaders: 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/FakeApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/FakeApi.md
index dd5e3225a65a..f17e38282a0c 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/FakeApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/FakeApi.md
@@ -1121,7 +1121,7 @@ void (empty response body)
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 [[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)
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/StoreApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/StoreApi.md
index 04c9407eb43b..aa0a568fc528 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/StoreApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/StoreApi.md
@@ -194,7 +194,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```csharp
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/scripts/git_push.ps1 b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/scripts/git_push.ps1
index 0a2d4e52280a..73ed35c2bb10 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/scripts/git_push.ps1
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/scripts/git_push.ps1
@@ -49,7 +49,7 @@ Set-StrictMode -Version 3.0
 if ($Help){
     Write-Output "
     This script will initialize a git repository, then add and commit all files.
-    The local repository will then be pushed to your prefered git provider.
+    The local repository will then be pushed to your preferred git provider.
     If the remote repository does not exist yet and you are using GitHub,
     the repository will be created for you provided you have the GitHub CLI installed.
     
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
index bfbb57aac81c..428a326e69ef 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
@@ -225,7 +225,7 @@ public async Task> Call123TestSpecialTagsWithHttpInfoAs
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -240,7 +240,7 @@ public async Task> Call123TestSpecialTagsWithHttpInfoAs
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }    }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/DefaultApi.cs
index 7877e961c271..78cd56816619 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/DefaultApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/DefaultApi.cs
@@ -200,7 +200,7 @@ public async Task> FooGetWithHttpInfoAsync(Sy
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -215,7 +215,7 @@ public async Task> FooGetWithHttpInfoAsync(Sy
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }    }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeApi.cs
index 23fd9c57a981..0f8c448ecd78 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -582,7 +582,7 @@ public async Task> FakeHealthGetWithHttpInfoAsync
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -597,7 +597,7 @@ public async Task> FakeHealthGetWithHttpInfoAsync
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -680,7 +680,7 @@ public async Task> FakeOuterBooleanSerializeWithHttpInfoAsync(
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -695,7 +695,7 @@ public async Task> FakeOuterBooleanSerializeWithHttpInfoAsync(
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -799,7 +799,7 @@ public async Task> FakeOuterCompositeSerializeWithHt
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -814,7 +814,7 @@ public async Task> FakeOuterCompositeSerializeWithHt
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -897,7 +897,7 @@ public async Task> FakeOuterNumberSerializeWithHttpInfoAsyn
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -912,7 +912,7 @@ public async Task> FakeOuterNumberSerializeWithHttpInfoAsyn
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -995,7 +995,7 @@ public async Task> FakeOuterStringSerializeWithHttpInfoAsync
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1010,7 +1010,7 @@ public async Task> FakeOuterStringSerializeWithHttpInfoAsync
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1098,7 +1098,7 @@ public async Task>> GetArrayOfEnumsWithHttpInfoAsync
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1113,7 +1113,7 @@ public async Task>> GetArrayOfEnumsWithHttpInfoAsync
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1215,7 +1215,7 @@ public async Task> TestBodyWithFileSchemaWithHttpInfoAsync(F
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1230,7 +1230,7 @@ public async Task> TestBodyWithFileSchemaWithHttpInfoAsync(F
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1344,7 +1344,7 @@ public async Task> TestBodyWithQueryParamsWithHttpInfoAsync(
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1359,7 +1359,7 @@ public async Task> TestBodyWithQueryParamsWithHttpInfoAsync(
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1470,7 +1470,7 @@ public async Task> TestClientModelWithHttpInfoAsync(Mod
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1485,7 +1485,7 @@ public async Task> TestClientModelWithHttpInfoAsync(Mod
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1679,7 +1679,7 @@ public async Task> TestEndpointParametersWithHttpInfoAsync(d
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1697,7 +1697,7 @@ public async Task> TestEndpointParametersWithHttpInfoAsync(d
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1844,7 +1844,7 @@ public async Task> TestEnumParametersWithHttpInfoAsync(List<
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1859,7 +1859,7 @@ public async Task> TestEnumParametersWithHttpInfoAsync(List<
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1986,7 +1986,7 @@ public async Task> TestGroupParametersWithHttpInfoAsync(int
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -2004,7 +2004,7 @@ public async Task> TestGroupParametersWithHttpInfoAsync(int
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -2106,7 +2106,7 @@ public async Task> TestInlineAdditionalPropertiesWithHttpInf
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -2121,7 +2121,7 @@ public async Task> TestInlineAdditionalPropertiesWithHttpInf
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -2237,7 +2237,7 @@ public async Task> TestJsonFormDataWithHttpInfoAsync(string
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -2252,7 +2252,7 @@ public async Task> TestJsonFormDataWithHttpInfoAsync(string
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -2375,7 +2375,7 @@ public async Task> TestQueryParameterCollectionFormatWithHtt
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -2390,7 +2390,7 @@ public async Task> TestQueryParameterCollectionFormatWithHtt
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }    }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
index 05debff86aba..321be9fcde06 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
@@ -237,7 +237,7 @@ public async Task> TestClassnameWithHttpInfoAsync(Model
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -255,7 +255,7 @@ public async Task> TestClassnameWithHttpInfoAsync(Model
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }    }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/PetApi.cs
index 8f01a7fc364c..53546aadb166 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/PetApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/PetApi.cs
@@ -431,7 +431,7 @@ public async Task> AddPetWithHttpInfoAsync(Pet pet, System.T
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -452,7 +452,7 @@ public async Task> AddPetWithHttpInfoAsync(Pet pet, System.T
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -553,7 +553,7 @@ public async Task> DeletePetWithHttpInfoAsync(long petId, st
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -571,7 +571,7 @@ public async Task> DeletePetWithHttpInfoAsync(long petId, st
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -692,7 +692,7 @@ public async Task>> FindPetsByStatusWithHttpInfoAsync(List
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -713,7 +713,7 @@ public async Task>> FindPetsByStatusWithHttpInfoAsync(List
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -834,7 +834,7 @@ public async Task>> FindPetsByTagsWithHttpInfoAsync(List>> FindPetsByTagsWithHttpInfoAsync(List> GetPetByIdWithHttpInfoAsync(long petId, Syst
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -978,7 +978,7 @@ public async Task> GetPetByIdWithHttpInfoAsync(long petId, Syst
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1097,7 +1097,7 @@ public async Task> UpdatePetWithHttpInfoAsync(Pet pet, Syste
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1118,7 +1118,7 @@ public async Task> UpdatePetWithHttpInfoAsync(Pet pet, Syste
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1242,7 +1242,7 @@ public async Task> UpdatePetWithFormWithHttpInfoAsync(long p
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1260,7 +1260,7 @@ public async Task> UpdatePetWithFormWithHttpInfoAsync(long p
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1393,7 +1393,7 @@ public async Task> UploadFileWithHttpInfoAsync(long pet
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1411,7 +1411,7 @@ public async Task> UploadFileWithHttpInfoAsync(long pet
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1547,7 +1547,7 @@ public async Task> UploadFileWithRequiredFileWithHttpIn
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1565,7 +1565,7 @@ public async Task> UploadFileWithRequiredFileWithHttpIn
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }    }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/StoreApi.cs
index cee9bd767c6e..e8a5a11078b0 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/StoreApi.cs
@@ -74,7 +74,7 @@ public interface IStoreApi : IApi
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -86,7 +86,7 @@ public interface IStoreApi : IApi
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -271,7 +271,7 @@ public async Task> DeleteOrderWithHttpInfoAsync(string order
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -286,7 +286,7 @@ public async Task> DeleteOrderWithHttpInfoAsync(string order
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -362,7 +362,7 @@ public async Task>> GetInventoryWithHttpInfo
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -380,13 +380,13 @@ public async Task>> GetInventoryWithHttpInfo
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -403,7 +403,7 @@ public async Task GetOrderByIdAsync(long orderId, System.Threading.Cancel
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -426,7 +426,7 @@ public async Task GetOrderByIdOrDefaultAsync(long orderId, System.Threadi
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -477,7 +477,7 @@ public async Task> GetOrderByIdWithHttpInfoAsync(long orderId
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -492,7 +492,7 @@ public async Task> GetOrderByIdWithHttpInfoAsync(long orderId
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -604,7 +604,7 @@ public async Task> PlaceOrderWithHttpInfoAsync(Order order, S
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -619,7 +619,7 @@ public async Task> PlaceOrderWithHttpInfoAsync(Order order, S
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }    }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/UserApi.cs
index f117a118b3bf..4c1b0c684684 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/UserApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/UserApi.cs
@@ -379,7 +379,7 @@ public async Task> CreateUserWithHttpInfoAsync(User user, Sy
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -394,7 +394,7 @@ public async Task> CreateUserWithHttpInfoAsync(User user, Sy
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -496,7 +496,7 @@ public async Task> CreateUsersWithArrayInputWithHttpInfoAsyn
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -511,7 +511,7 @@ public async Task> CreateUsersWithArrayInputWithHttpInfoAsyn
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -613,7 +613,7 @@ public async Task> CreateUsersWithListInputWithHttpInfoAsync
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -628,7 +628,7 @@ public async Task> CreateUsersWithListInputWithHttpInfoAsync
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -718,7 +718,7 @@ public async Task> DeleteUserWithHttpInfoAsync(string userna
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -733,7 +733,7 @@ public async Task> DeleteUserWithHttpInfoAsync(string userna
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -833,7 +833,7 @@ public async Task> GetUserByNameWithHttpInfoAsync(string usern
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -848,7 +848,7 @@ public async Task> GetUserByNameWithHttpInfoAsync(string usern
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -938,7 +938,7 @@ public async Task> LoginUserWithHttpInfoAsync(string usernam
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -953,7 +953,7 @@ public async Task> LoginUserWithHttpInfoAsync(string usernam
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1032,7 +1032,7 @@ public async Task> LogoutUserWithHttpInfoAsync(System.Thread
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1047,7 +1047,7 @@ public async Task> LogoutUserWithHttpInfoAsync(System.Thread
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1156,7 +1156,7 @@ public async Task> UpdateUserWithHttpInfoAsync(string userna
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1171,7 +1171,7 @@ public async Task> UpdateUserWithHttpInfoAsync(string userna
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }    }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiException.cs
index 5728b5976d90..fdd11dd19c9a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiException.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiException.cs
@@ -33,7 +33,7 @@ public class ApiException : Exception
         public string RawContent { get; }
         
         /// 
-        /// Construct the ApiException from parts of the reponse
+        /// Construct the ApiException from parts of the response
         /// 
         /// 
         /// 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiResponse`1.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiResponse`1.cs
index 85b2801ccbfb..3bae0aaa6aba 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiResponse`1.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiResponse`1.cs
@@ -85,7 +85,7 @@ public Type ResponseType
         #endregion Properties
 
         /// 
-        /// Construct the reponse using an HttpResponseMessage
+        /// Construct the response using an HttpResponseMessage
         /// 
         /// 
         /// 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
index c06ba4c50a0e..2b5ac96e1cd1 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
@@ -194,7 +194,7 @@ internal Dictionary GetHttpSignedHeader(System.Net.Http.HttpRequ
             foreach (var keyVal in httpSignatureHeader)
                 headerValuesList.Add(string.Format("{0}: {1}", keyVal.Key, keyVal.Value));
 
-            //Concatinate headers value separated by new line
+            //Concatenate headers value separated by new line
             var headerValuesString = string.Join("\n", headerValuesList);
             var signatureStringHash = GetStringHash(HashAlgorithm.ToString(), headerValuesString);
             string headerSignatureStr = null;
@@ -322,7 +322,7 @@ private string GetECDSASignature(byte[] dataToSign)
         private  byte[] ConvertToECDSAANS1Format(byte[] signedBytes)
         {
             var derBytes = new List();
-            byte derLength = 68; //default lenght for ECDSA code signinged bit 0x44
+            byte derLength = 68; //default length for ECDSA code signing bit 0x44
             byte rbytesLength = 32; //R length 0x20
             byte sbytesLength = 32; //S length 0x20
             var rBytes = new List();
@@ -357,7 +357,7 @@ private  byte[] ConvertToECDSAANS1Format(byte[] signedBytes)
             }
 
             derBytes.Add(48);  //start of the sequence 0x30
-            derBytes.Add(derLength);  //total length r lenth, type and r bytes
+            derBytes.Add(derLength);  //total length r length, type and r bytes
 
             derBytes.Add(2); //tag for integer
             derBytes.Add(rbytesLength); //length of r
@@ -369,7 +369,7 @@ private  byte[] ConvertToECDSAANS1Format(byte[] signedBytes)
             return derBytes.ToArray();
         }
 
-        private  RSACryptoServiceProvider GetRSAProviderFromPemFile(String pemfile, SecureString keyPassPharse = null)
+        private  RSACryptoServiceProvider GetRSAProviderFromPemFile(String pemfile, SecureString keyPassPhrase = null)
         {
             const String pempubheader = "-----BEGIN PUBLIC KEY-----";
             const String pempubfooter = "-----END PUBLIC KEY-----";
@@ -386,7 +386,7 @@ private  RSACryptoServiceProvider GetRSAProviderFromPemFile(String pemfile, Secu
 
             if (isPrivateKeyFile)
             {
-                pemkey = ConvertPrivateKeyToBytes(pemstr, keyPassPharse);
+                pemkey = ConvertPrivateKeyToBytes(pemstr, keyPassPhrase);
 
                 if (pemkey == null)
                     return null;
@@ -396,7 +396,7 @@ private  RSACryptoServiceProvider GetRSAProviderFromPemFile(String pemfile, Secu
             return null;
         }
 
-        private byte[] ConvertPrivateKeyToBytes(String instr, SecureString keyPassPharse = null)
+        private byte[] ConvertPrivateKeyToBytes(String instr, SecureString keyPassPhrase = null)
         {
             const String pemprivheader = "-----BEGIN RSA PRIVATE KEY-----";
             const String pemprivfooter = "-----END RSA PRIVATE KEY-----";
@@ -444,12 +444,12 @@ private byte[] ConvertPrivateKeyToBytes(String instr, SecureString keyPassPharse
                     binkey = Convert.FromBase64String(encryptedstr);
                 }
                 catch (System.FormatException)
-                {   //data is not in base64 fromat
+                {   //data is not in base64 format
                     return null;
                 }
 
-                // TODO: what do we do here if keyPassPharse is null?
-                byte[] deskey = GetEncryptedKey(salt, keyPassPharse, 1, 2);    // count=1 (for OpenSSL implementation); 2 iterations to get at least 24 bytes
+                // TODO: what do we do here if keyPassPhrase is null?
+                byte[] deskey = GetEncryptedKey(salt, keyPassPhrase, 1, 2);    // count=1 (for OpenSSL implementation); 2 iterations to get at least 24 bytes
                 if (deskey == null)
                     return null;
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/README.md
index 5680ae8cbc44..a8ac54da0c44 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/README.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/README.md
@@ -216,7 +216,7 @@ Authentication schemes defined for the API:
 - modelTests: true
 - withXml: 
 
-## [OpenApi Generator Parameteres](https://openapi-generator.tech/docs/generators/csharp-netcore)
+## [OpenApi Generator Parameters](https://openapi-generator.tech/docs/generators/csharp-netcore)
 - allowUnicodeIdentifiers: 
 - apiName: Api
 - caseInsensitiveResponseHeaders: 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/FakeApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/FakeApi.md
index dd5e3225a65a..f17e38282a0c 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/FakeApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/FakeApi.md
@@ -1121,7 +1121,7 @@ void (empty response body)
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 [[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)
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/StoreApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/StoreApi.md
index 04c9407eb43b..aa0a568fc528 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/StoreApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/StoreApi.md
@@ -194,7 +194,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```csharp
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/scripts/git_push.ps1 b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/scripts/git_push.ps1
index 0a2d4e52280a..73ed35c2bb10 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/scripts/git_push.ps1
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/scripts/git_push.ps1
@@ -49,7 +49,7 @@ Set-StrictMode -Version 3.0
 if ($Help){
     Write-Output "
     This script will initialize a git repository, then add and commit all files.
-    The local repository will then be pushed to your prefered git provider.
+    The local repository will then be pushed to your preferred git provider.
     If the remote repository does not exist yet and you are using GitHub,
     the repository will be created for you provided you have the GitHub CLI installed.
     
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
index 59670fb4cbc5..b2b9905d3a76 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
@@ -225,7 +225,7 @@ public async Task> Call123TestSpecialTagsWithHttpInfoAs
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -240,7 +240,7 @@ public async Task> Call123TestSpecialTagsWithHttpInfoAs
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }    }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/DefaultApi.cs
index ea2f1ced70b9..2f874775c606 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/DefaultApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/DefaultApi.cs
@@ -200,7 +200,7 @@ public async Task> FooGetWithHttpInfoAsync(Sy
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -215,7 +215,7 @@ public async Task> FooGetWithHttpInfoAsync(Sy
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }    }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeApi.cs
index cad800bddfba..f9f02ecc2197 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -582,7 +582,7 @@ public async Task> FakeHealthGetWithHttpInfoAsync
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -597,7 +597,7 @@ public async Task> FakeHealthGetWithHttpInfoAsync
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -680,7 +680,7 @@ public async Task> FakeOuterBooleanSerializeWithHttpInfoAsync(
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -695,7 +695,7 @@ public async Task> FakeOuterBooleanSerializeWithHttpInfoAsync(
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -799,7 +799,7 @@ public async Task> FakeOuterCompositeSerializeWithHt
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -814,7 +814,7 @@ public async Task> FakeOuterCompositeSerializeWithHt
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -897,7 +897,7 @@ public async Task> FakeOuterNumberSerializeWithHttpInfoAsyn
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -912,7 +912,7 @@ public async Task> FakeOuterNumberSerializeWithHttpInfoAsyn
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -995,7 +995,7 @@ public async Task> FakeOuterStringSerializeWithHttpInfoAsync
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1010,7 +1010,7 @@ public async Task> FakeOuterStringSerializeWithHttpInfoAsync
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1098,7 +1098,7 @@ public async Task>> GetArrayOfEnumsWithHttpInfoAsync
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1113,7 +1113,7 @@ public async Task>> GetArrayOfEnumsWithHttpInfoAsync
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1215,7 +1215,7 @@ public async Task> TestBodyWithFileSchemaWithHttpInfoAsync(F
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1230,7 +1230,7 @@ public async Task> TestBodyWithFileSchemaWithHttpInfoAsync(F
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1344,7 +1344,7 @@ public async Task> TestBodyWithQueryParamsWithHttpInfoAsync(
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1359,7 +1359,7 @@ public async Task> TestBodyWithQueryParamsWithHttpInfoAsync(
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1470,7 +1470,7 @@ public async Task> TestClientModelWithHttpInfoAsync(Mod
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1485,7 +1485,7 @@ public async Task> TestClientModelWithHttpInfoAsync(Mod
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1679,7 +1679,7 @@ public async Task> TestEndpointParametersWithHttpInfoAsync(d
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1697,7 +1697,7 @@ public async Task> TestEndpointParametersWithHttpInfoAsync(d
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1844,7 +1844,7 @@ public async Task> TestEnumParametersWithHttpInfoAsync(List<
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1859,7 +1859,7 @@ public async Task> TestEnumParametersWithHttpInfoAsync(List<
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1986,7 +1986,7 @@ public async Task> TestGroupParametersWithHttpInfoAsync(int
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -2004,7 +2004,7 @@ public async Task> TestGroupParametersWithHttpInfoAsync(int
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -2106,7 +2106,7 @@ public async Task> TestInlineAdditionalPropertiesWithHttpInf
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -2121,7 +2121,7 @@ public async Task> TestInlineAdditionalPropertiesWithHttpInf
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -2237,7 +2237,7 @@ public async Task> TestJsonFormDataWithHttpInfoAsync(string
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -2252,7 +2252,7 @@ public async Task> TestJsonFormDataWithHttpInfoAsync(string
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -2375,7 +2375,7 @@ public async Task> TestQueryParameterCollectionFormatWithHtt
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -2390,7 +2390,7 @@ public async Task> TestQueryParameterCollectionFormatWithHtt
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }    }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
index 528e98484d8f..4b51987ecd31 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
@@ -237,7 +237,7 @@ public async Task> TestClassnameWithHttpInfoAsync(Model
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -255,7 +255,7 @@ public async Task> TestClassnameWithHttpInfoAsync(Model
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }    }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/PetApi.cs
index dda60de460d5..c8249afbb48e 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/PetApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/PetApi.cs
@@ -431,7 +431,7 @@ public async Task> AddPetWithHttpInfoAsync(Pet pet, System.T
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -452,7 +452,7 @@ public async Task> AddPetWithHttpInfoAsync(Pet pet, System.T
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -553,7 +553,7 @@ public async Task> DeletePetWithHttpInfoAsync(long petId, st
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -571,7 +571,7 @@ public async Task> DeletePetWithHttpInfoAsync(long petId, st
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -692,7 +692,7 @@ public async Task>> FindPetsByStatusWithHttpInfoAsync(List
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -713,7 +713,7 @@ public async Task>> FindPetsByStatusWithHttpInfoAsync(List
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -834,7 +834,7 @@ public async Task>> FindPetsByTagsWithHttpInfoAsync(List>> FindPetsByTagsWithHttpInfoAsync(List> GetPetByIdWithHttpInfoAsync(long petId, Syst
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -978,7 +978,7 @@ public async Task> GetPetByIdWithHttpInfoAsync(long petId, Syst
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1097,7 +1097,7 @@ public async Task> UpdatePetWithHttpInfoAsync(Pet pet, Syste
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1118,7 +1118,7 @@ public async Task> UpdatePetWithHttpInfoAsync(Pet pet, Syste
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1242,7 +1242,7 @@ public async Task> UpdatePetWithFormWithHttpInfoAsync(long p
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1260,7 +1260,7 @@ public async Task> UpdatePetWithFormWithHttpInfoAsync(long p
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1393,7 +1393,7 @@ public async Task> UploadFileWithHttpInfoAsync(long pet
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1411,7 +1411,7 @@ public async Task> UploadFileWithHttpInfoAsync(long pet
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1547,7 +1547,7 @@ public async Task> UploadFileWithRequiredFileWithHttpIn
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1565,7 +1565,7 @@ public async Task> UploadFileWithRequiredFileWithHttpIn
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }    }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/StoreApi.cs
index 0c0066afae72..a0be4ccdafb4 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/StoreApi.cs
@@ -74,7 +74,7 @@ public interface IStoreApi : IApi
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -86,7 +86,7 @@ public interface IStoreApi : IApi
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -271,7 +271,7 @@ public async Task> DeleteOrderWithHttpInfoAsync(string order
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -286,7 +286,7 @@ public async Task> DeleteOrderWithHttpInfoAsync(string order
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -362,7 +362,7 @@ public async Task>> GetInventoryWithHttpInfo
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -380,13 +380,13 @@ public async Task>> GetInventoryWithHttpInfo
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -403,7 +403,7 @@ public async Task GetOrderByIdAsync(long orderId, System.Threading.Cancel
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -426,7 +426,7 @@ public async Task GetOrderByIdOrDefaultAsync(long orderId, System.Threadi
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -477,7 +477,7 @@ public async Task> GetOrderByIdWithHttpInfoAsync(long orderId
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -492,7 +492,7 @@ public async Task> GetOrderByIdWithHttpInfoAsync(long orderId
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -604,7 +604,7 @@ public async Task> PlaceOrderWithHttpInfoAsync(Order order, S
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -619,7 +619,7 @@ public async Task> PlaceOrderWithHttpInfoAsync(Order order, S
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }    }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/UserApi.cs
index 921dc7c29eb1..554608a79aa2 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/UserApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/UserApi.cs
@@ -379,7 +379,7 @@ public async Task> CreateUserWithHttpInfoAsync(User user, Sy
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -394,7 +394,7 @@ public async Task> CreateUserWithHttpInfoAsync(User user, Sy
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -496,7 +496,7 @@ public async Task> CreateUsersWithArrayInputWithHttpInfoAsyn
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -511,7 +511,7 @@ public async Task> CreateUsersWithArrayInputWithHttpInfoAsyn
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -613,7 +613,7 @@ public async Task> CreateUsersWithListInputWithHttpInfoAsync
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -628,7 +628,7 @@ public async Task> CreateUsersWithListInputWithHttpInfoAsync
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -718,7 +718,7 @@ public async Task> DeleteUserWithHttpInfoAsync(string userna
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -733,7 +733,7 @@ public async Task> DeleteUserWithHttpInfoAsync(string userna
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -833,7 +833,7 @@ public async Task> GetUserByNameWithHttpInfoAsync(string usern
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -848,7 +848,7 @@ public async Task> GetUserByNameWithHttpInfoAsync(string usern
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -938,7 +938,7 @@ public async Task> LoginUserWithHttpInfoAsync(string usernam
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -953,7 +953,7 @@ public async Task> LoginUserWithHttpInfoAsync(string usernam
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1032,7 +1032,7 @@ public async Task> LogoutUserWithHttpInfoAsync(System.Thread
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1047,7 +1047,7 @@ public async Task> LogoutUserWithHttpInfoAsync(System.Thread
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }
@@ -1156,7 +1156,7 @@ public async Task> UpdateUserWithHttpInfoAsync(string userna
                             }
                             catch(Exception e)
                             {
-                                Logger.LogError(e, "An error occured while invoking ApiResponded.");
+                                Logger.LogError(e, "An error occurred while invoking ApiResponded.");
                             }
                         }
 
@@ -1171,7 +1171,7 @@ public async Task> UpdateUserWithHttpInfoAsync(string userna
             }
             catch(Exception e)
             {
-                Logger.LogError(e, "An error occured while sending the request to the server.");
+                Logger.LogError(e, "An error occurred while sending the request to the server.");
                 throw;
             }
         }    }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiException.cs
index 5728b5976d90..fdd11dd19c9a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiException.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiException.cs
@@ -33,7 +33,7 @@ public class ApiException : Exception
         public string RawContent { get; }
         
         /// 
-        /// Construct the ApiException from parts of the reponse
+        /// Construct the ApiException from parts of the response
         /// 
         /// 
         /// 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiResponse`1.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiResponse`1.cs
index 85b2801ccbfb..3bae0aaa6aba 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiResponse`1.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiResponse`1.cs
@@ -85,7 +85,7 @@ public Type ResponseType
         #endregion Properties
 
         /// 
-        /// Construct the reponse using an HttpResponseMessage
+        /// Construct the response using an HttpResponseMessage
         /// 
         /// 
         /// 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
index c06ba4c50a0e..2b5ac96e1cd1 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
@@ -194,7 +194,7 @@ internal Dictionary GetHttpSignedHeader(System.Net.Http.HttpRequ
             foreach (var keyVal in httpSignatureHeader)
                 headerValuesList.Add(string.Format("{0}: {1}", keyVal.Key, keyVal.Value));
 
-            //Concatinate headers value separated by new line
+            //Concatenate headers value separated by new line
             var headerValuesString = string.Join("\n", headerValuesList);
             var signatureStringHash = GetStringHash(HashAlgorithm.ToString(), headerValuesString);
             string headerSignatureStr = null;
@@ -322,7 +322,7 @@ private string GetECDSASignature(byte[] dataToSign)
         private  byte[] ConvertToECDSAANS1Format(byte[] signedBytes)
         {
             var derBytes = new List();
-            byte derLength = 68; //default lenght for ECDSA code signinged bit 0x44
+            byte derLength = 68; //default length for ECDSA code signing bit 0x44
             byte rbytesLength = 32; //R length 0x20
             byte sbytesLength = 32; //S length 0x20
             var rBytes = new List();
@@ -357,7 +357,7 @@ private  byte[] ConvertToECDSAANS1Format(byte[] signedBytes)
             }
 
             derBytes.Add(48);  //start of the sequence 0x30
-            derBytes.Add(derLength);  //total length r lenth, type and r bytes
+            derBytes.Add(derLength);  //total length r length, type and r bytes
 
             derBytes.Add(2); //tag for integer
             derBytes.Add(rbytesLength); //length of r
@@ -369,7 +369,7 @@ private  byte[] ConvertToECDSAANS1Format(byte[] signedBytes)
             return derBytes.ToArray();
         }
 
-        private  RSACryptoServiceProvider GetRSAProviderFromPemFile(String pemfile, SecureString keyPassPharse = null)
+        private  RSACryptoServiceProvider GetRSAProviderFromPemFile(String pemfile, SecureString keyPassPhrase = null)
         {
             const String pempubheader = "-----BEGIN PUBLIC KEY-----";
             const String pempubfooter = "-----END PUBLIC KEY-----";
@@ -386,7 +386,7 @@ private  RSACryptoServiceProvider GetRSAProviderFromPemFile(String pemfile, Secu
 
             if (isPrivateKeyFile)
             {
-                pemkey = ConvertPrivateKeyToBytes(pemstr, keyPassPharse);
+                pemkey = ConvertPrivateKeyToBytes(pemstr, keyPassPhrase);
 
                 if (pemkey == null)
                     return null;
@@ -396,7 +396,7 @@ private  RSACryptoServiceProvider GetRSAProviderFromPemFile(String pemfile, Secu
             return null;
         }
 
-        private byte[] ConvertPrivateKeyToBytes(String instr, SecureString keyPassPharse = null)
+        private byte[] ConvertPrivateKeyToBytes(String instr, SecureString keyPassPhrase = null)
         {
             const String pemprivheader = "-----BEGIN RSA PRIVATE KEY-----";
             const String pemprivfooter = "-----END RSA PRIVATE KEY-----";
@@ -444,12 +444,12 @@ private byte[] ConvertPrivateKeyToBytes(String instr, SecureString keyPassPharse
                     binkey = Convert.FromBase64String(encryptedstr);
                 }
                 catch (System.FormatException)
-                {   //data is not in base64 fromat
+                {   //data is not in base64 format
                     return null;
                 }
 
-                // TODO: what do we do here if keyPassPharse is null?
-                byte[] deskey = GetEncryptedKey(salt, keyPassPharse, 1, 2);    // count=1 (for OpenSSL implementation); 2 iterations to get at least 24 bytes
+                // TODO: what do we do here if keyPassPhrase is null?
+                byte[] deskey = GetEncryptedKey(salt, keyPassPhrase, 1, 2);    // count=1 (for OpenSSL implementation); 2 iterations to get at least 24 bytes
                 if (deskey == null)
                     return null;
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FakeApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FakeApi.md
index 53a8b4e4eb4b..3f38af8889e1 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FakeApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FakeApi.md
@@ -1169,7 +1169,7 @@ void (empty response body)
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 [[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)
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/StoreApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/StoreApi.md
index 449b73a0a51e..7ed28712f895 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/StoreApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/StoreApi.md
@@ -202,7 +202,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```csharp
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
index 1af712abb4d0..f0b087398912 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
@@ -36,7 +36,7 @@ public class PetApiTests : IDisposable
         private PetApi instance;
 
         private long petId = 11088;
-        private long notExsistentPetId = 99999;
+        private long notExistentPetId = 99999;
 
         /// 
         /// Create a Pet object
@@ -206,7 +206,7 @@ public void TestGetPetByIdAsync()
         }
 
         /// 
-        /// Test GetPetById on an not existent Id
+        /// Test GetPetById on a non-existent Id
         /// 
         [Fact]
         public void TestGetPetById_TestException()
@@ -215,7 +215,7 @@ public void TestGetPetById_TestException()
 
 	        var exception = Assert.Throws(() =>
 	        {
-		        petApi.GetPetById(notExsistentPetId);
+		        petApi.GetPetById(notExistentPetId);
 	        });
 
 	        Assert.IsType(exception);
@@ -233,7 +233,7 @@ public void TestGetByIdBinaryResponse()
             Assert.IsType(response);
             StreamReader reader = new StreamReader(response);
             // the following will fail for sure
-            //Assert.Equal("someting", reader.ReadToEnd());
+            //Assert.Equal("something", reader.ReadToEnd());
         }
         */
 
@@ -273,7 +273,7 @@ public void TestGetPetByIdWithHttpInfoAsync_Test404Response()
         {
 	        PetApi petApi = new PetApi();
 	        petApi.ExceptionFactory = null;
-	        var response = petApi.GetPetByIdWithHttpInfoAsync(notExsistentPetId).Result;
+	        var response = petApi.GetPetByIdWithHttpInfoAsync(notExistentPetId).Result;
 	        Pet result = response.Data;
 
 	        Assert.IsType>(response);
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/StoreApi.cs
index 37ab94173a06..c3378fb12aa2 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/StoreApi.cs
@@ -71,7 +71,7 @@ public interface IStoreApiSync : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -82,7 +82,7 @@ public interface IStoreApiSync : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -163,7 +163,7 @@ public interface IStoreApiAsync : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -175,7 +175,7 @@ public interface IStoreApiAsync : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -641,7 +641,7 @@ public Org.OpenAPITools.Client.ApiResponse> GetInventory
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -653,7 +653,7 @@ public Order GetOrderById(long orderId)
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -693,7 +693,7 @@ public Org.OpenAPITools.Client.ApiResponse GetOrderByIdWithHttpInfo(long
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -706,7 +706,7 @@ public Org.OpenAPITools.Client.ApiResponse GetOrderByIdWithHttpInfo(long
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/RequestOptions.cs
index 70b67cb25906..50e0c8e017f5 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/RequestOptions.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/RequestOptions.cs
@@ -33,7 +33,7 @@ public class RequestOptions
         public Multimap QueryParameters { get; set; }
 
         /// 
-        /// Header parameters to be applied to to the request.
+        /// Header parameters to be applied to the request.
         /// Keys may have 1 or more values associated.
         /// 
         public Multimap HeaderParameters { get; set; }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FakeApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FakeApi.md
index 46d135e359f8..212d1d35c49b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FakeApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FakeApi.md
@@ -1121,7 +1121,7 @@ void (empty response body)
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 [[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)
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/StoreApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/StoreApi.md
index 95bbe1b2f13f..de4414feafc5 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/StoreApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/StoreApi.md
@@ -194,7 +194,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```csharp
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Api/StoreApi.cs
index e01ed1625899..e8bed0a150ec 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Api/StoreApi.cs
@@ -75,7 +75,7 @@ public interface IStoreApiSync : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -87,7 +87,7 @@ public interface IStoreApiSync : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -175,7 +175,7 @@ public interface IStoreApiAsync : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -188,7 +188,7 @@ public interface IStoreApiAsync : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -618,7 +618,7 @@ public Org.OpenAPITools.Client.ApiResponse> GetInventory
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -631,7 +631,7 @@ public Order GetOrderById(long orderId, int operationIndex = 0)
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -683,7 +683,7 @@ public Org.OpenAPITools.Client.ApiResponse GetOrderByIdWithHttpInfo(long
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -697,7 +697,7 @@ public Org.OpenAPITools.Client.ApiResponse GetOrderByIdWithHttpInfo(long
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/RequestOptions.cs
index 4c26cf69b24d..f5e02e93f0f9 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/RequestOptions.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/RequestOptions.cs
@@ -33,7 +33,7 @@ public class RequestOptions
         public Multimap QueryParameters { get; set; }
 
         /// 
-        /// Header parameters to be applied to to the request.
+        /// Header parameters to be applied to the request.
         /// Keys may have 1 or more values associated.
         /// 
         public Multimap HeaderParameters { get; set; }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/FakeApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/FakeApi.md
index 46d135e359f8..212d1d35c49b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/FakeApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/FakeApi.md
@@ -1121,7 +1121,7 @@ void (empty response body)
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 [[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)
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/StoreApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/StoreApi.md
index 95bbe1b2f13f..de4414feafc5 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/StoreApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/StoreApi.md
@@ -194,7 +194,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```csharp
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Api/StoreApi.cs
index e01ed1625899..e8bed0a150ec 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Api/StoreApi.cs
@@ -75,7 +75,7 @@ public interface IStoreApiSync : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -87,7 +87,7 @@ public interface IStoreApiSync : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -175,7 +175,7 @@ public interface IStoreApiAsync : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -188,7 +188,7 @@ public interface IStoreApiAsync : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -618,7 +618,7 @@ public Org.OpenAPITools.Client.ApiResponse> GetInventory
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -631,7 +631,7 @@ public Order GetOrderById(long orderId, int operationIndex = 0)
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -683,7 +683,7 @@ public Org.OpenAPITools.Client.ApiResponse GetOrderByIdWithHttpInfo(long
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -697,7 +697,7 @@ public Org.OpenAPITools.Client.ApiResponse GetOrderByIdWithHttpInfo(long
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/RequestOptions.cs
index 4c26cf69b24d..f5e02e93f0f9 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/RequestOptions.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/RequestOptions.cs
@@ -33,7 +33,7 @@ public class RequestOptions
         public Multimap QueryParameters { get; set; }
 
         /// 
-        /// Header parameters to be applied to to the request.
+        /// Header parameters to be applied to the request.
         /// Keys may have 1 or more values associated.
         /// 
         public Multimap HeaderParameters { get; set; }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FakeApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FakeApi.md
index 46d135e359f8..212d1d35c49b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FakeApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FakeApi.md
@@ -1121,7 +1121,7 @@ void (empty response body)
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 [[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)
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/StoreApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/StoreApi.md
index 95bbe1b2f13f..de4414feafc5 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/StoreApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/StoreApi.md
@@ -194,7 +194,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```csharp
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/StoreApi.cs
index e01ed1625899..e8bed0a150ec 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/StoreApi.cs
@@ -75,7 +75,7 @@ public interface IStoreApiSync : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -87,7 +87,7 @@ public interface IStoreApiSync : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -175,7 +175,7 @@ public interface IStoreApiAsync : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -188,7 +188,7 @@ public interface IStoreApiAsync : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -618,7 +618,7 @@ public Org.OpenAPITools.Client.ApiResponse> GetInventory
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -631,7 +631,7 @@ public Order GetOrderById(long orderId, int operationIndex = 0)
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -683,7 +683,7 @@ public Org.OpenAPITools.Client.ApiResponse GetOrderByIdWithHttpInfo(long
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -697,7 +697,7 @@ public Org.OpenAPITools.Client.ApiResponse GetOrderByIdWithHttpInfo(long
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/RequestOptions.cs
index 4c26cf69b24d..f5e02e93f0f9 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/RequestOptions.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/RequestOptions.cs
@@ -33,7 +33,7 @@ public class RequestOptions
         public Multimap QueryParameters { get; set; }
 
         /// 
-        /// Header parameters to be applied to to the request.
+        /// Header parameters to be applied to the request.
         /// Keys may have 1 or more values associated.
         /// 
         public Multimap HeaderParameters { get; set; }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FakeApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FakeApi.md
index 46d135e359f8..212d1d35c49b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FakeApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FakeApi.md
@@ -1121,7 +1121,7 @@ void (empty response body)
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 [[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)
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/StoreApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/StoreApi.md
index 95bbe1b2f13f..de4414feafc5 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/StoreApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/StoreApi.md
@@ -194,7 +194,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```csharp
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
index cce6e896f05f..04bbe4755802 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
@@ -210,7 +210,7 @@ public void TestGetByIdBinaryResponse()
             Assert.IsType(response);
             StreamReader reader = new StreamReader(response);
             // the following will fail for sure
-            //Assert.Equal("someting", reader.ReadToEnd());
+            //Assert.Equal("something", reader.ReadToEnd());
         }
         */
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/JSONComposedSchemaTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/JSONComposedSchemaTests.cs
index 597290919078..00efbb9d160d 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/JSONComposedSchemaTests.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/JSONComposedSchemaTests.cs
@@ -152,7 +152,7 @@ public void TestCat()
         }
 
         /// 
-        /// Test additonal properties
+        /// Test additional properties
         /// 
         [Fact]
         public void TestAdditionalProperties()
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/PetTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/PetTests.cs
index 927c21ee4be1..d514e9a043c8 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/PetTests.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/PetTests.cs
@@ -106,12 +106,12 @@ public void TestSerialization()
             Pet p1 = new Pet(name: "Csharp test", photoUrls: new List { "http://petstore.com/csharp_test" });
             Assert.Equal("{\"name\":\"Csharp test\",\"photoUrls\":[\"http://petstore.com/csharp_test\"]}", JsonConvert.SerializeObject(p1));
 
-            // test additonal properties (serialization)
+            // test additional properties (serialization)
             Pet p2 = new Pet(name: "Csharp test", photoUrls: new List { "http://petstore.com/csharp_test" });
             p2.AdditionalProperties.Add("hello", "world");
             Assert.Equal("{\"name\":\"Csharp test\",\"photoUrls\":[\"http://petstore.com/csharp_test\"],\"hello\":\"world\"}", JsonConvert.SerializeObject(p2));
 
-            // test additonal properties (deserialization)
+            // test additional properties (deserialization)
             Pet p3 = JsonConvert.DeserializeObject("{\"name\":\"Csharp test\",\"photoUrls\":[\"http://petstore.com/csharp_test\"],\"hello\":\"world\",\"int\":123}");
             Assert.Equal("Csharp test", p3.Name);
             Assert.Equal("world", p3.AdditionalProperties["hello"]);
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/StoreApi.cs
index e01ed1625899..e8bed0a150ec 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/StoreApi.cs
@@ -75,7 +75,7 @@ public interface IStoreApiSync : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -87,7 +87,7 @@ public interface IStoreApiSync : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -175,7 +175,7 @@ public interface IStoreApiAsync : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -188,7 +188,7 @@ public interface IStoreApiAsync : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -618,7 +618,7 @@ public Org.OpenAPITools.Client.ApiResponse> GetInventory
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -631,7 +631,7 @@ public Order GetOrderById(long orderId, int operationIndex = 0)
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -683,7 +683,7 @@ public Org.OpenAPITools.Client.ApiResponse GetOrderByIdWithHttpInfo(long
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -697,7 +697,7 @@ public Org.OpenAPITools.Client.ApiResponse GetOrderByIdWithHttpInfo(long
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/RequestOptions.cs
index 4c26cf69b24d..f5e02e93f0f9 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/RequestOptions.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/RequestOptions.cs
@@ -33,7 +33,7 @@ public class RequestOptions
         public Multimap QueryParameters { get; set; }
 
         /// 
-        /// Header parameters to be applied to to the request.
+        /// Header parameters to be applied to the request.
         /// Keys may have 1 or more values associated.
         /// 
         public Multimap HeaderParameters { get; set; }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.nuspec b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.nuspec
index b05e013ebc5c..130ebd5b7f55 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.nuspec
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.nuspec
@@ -12,7 +12,7 @@
         $author$
 
         
+             users to easily find other packages by the same owners.  -->
         $author$
         false
         false
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FakeApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FakeApi.md
index 46d135e359f8..212d1d35c49b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FakeApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FakeApi.md
@@ -1121,7 +1121,7 @@ void (empty response body)
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 [[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)
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/StoreApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/StoreApi.md
index 95bbe1b2f13f..de4414feafc5 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/StoreApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/StoreApi.md
@@ -194,7 +194,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```csharp
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/StoreApi.cs
index e01ed1625899..e8bed0a150ec 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/StoreApi.cs
@@ -75,7 +75,7 @@ public interface IStoreApiSync : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -87,7 +87,7 @@ public interface IStoreApiSync : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -175,7 +175,7 @@ public interface IStoreApiAsync : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -188,7 +188,7 @@ public interface IStoreApiAsync : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -618,7 +618,7 @@ public Org.OpenAPITools.Client.ApiResponse> GetInventory
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -631,7 +631,7 @@ public Order GetOrderById(long orderId, int operationIndex = 0)
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -683,7 +683,7 @@ public Org.OpenAPITools.Client.ApiResponse GetOrderByIdWithHttpInfo(long
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -697,7 +697,7 @@ public Org.OpenAPITools.Client.ApiResponse GetOrderByIdWithHttpInfo(long
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/RequestOptions.cs
index 4c26cf69b24d..f5e02e93f0f9 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/RequestOptions.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/RequestOptions.cs
@@ -33,7 +33,7 @@ public class RequestOptions
         public Multimap QueryParameters { get; set; }
 
         /// 
-        /// Header parameters to be applied to to the request.
+        /// Header parameters to be applied to the request.
         /// Keys may have 1 or more values associated.
         /// 
         public Multimap HeaderParameters { get; set; }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.nuspec b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.nuspec
index 4200b72d479b..678c8dac4974 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.nuspec
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.nuspec
@@ -12,7 +12,7 @@
         $author$
 
         
+             users to easily find other packages by the same owners.  -->
         $author$
         false
         false
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/docs/StoreApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/docs/StoreApi.md
index 019ff47ee0c7..b8d93abcd2a2 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/docs/StoreApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/docs/StoreApi.md
@@ -194,7 +194,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```csharp
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Api/StoreApi.cs
index dd8faec043e5..3fb02496f77a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Api/StoreApi.cs
@@ -75,7 +75,7 @@ public interface IStoreApiSync : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -87,7 +87,7 @@ public interface IStoreApiSync : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -175,7 +175,7 @@ public interface IStoreApiAsync : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -188,7 +188,7 @@ public interface IStoreApiAsync : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -618,7 +618,7 @@ public Org.OpenAPITools.Client.ApiResponse> GetInventory
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -631,7 +631,7 @@ public Order GetOrderById(long orderId, int operationIndex = 0)
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -683,7 +683,7 @@ public Org.OpenAPITools.Client.ApiResponse GetOrderByIdWithHttpInfo(long
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -697,7 +697,7 @@ public Org.OpenAPITools.Client.ApiResponse GetOrderByIdWithHttpInfo(long
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/RequestOptions.cs
index aef6b76e9569..20366c4e7cc4 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/RequestOptions.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/RequestOptions.cs
@@ -33,7 +33,7 @@ public class RequestOptions
         public Multimap QueryParameters { get; set; }
 
         /// 
-        /// Header parameters to be applied to to the request.
+        /// Header parameters to be applied to the request.
         /// Keys may have 1 or more values associated.
         /// 
         public Multimap HeaderParameters { get; set; }
diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md
index 426116d6367d..73edec3b9d19 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md
+++ b/samples/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md
@@ -1123,7 +1123,7 @@ void (empty response body)
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 [[Back to top]](#)
 [[Back to API list]](../README.md#documentation-for-api-endpoints)
diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/StoreApi.md b/samples/client/petstore/csharp/OpenAPIClient/docs/StoreApi.md
index 3a452bc4d698..f38f7518673f 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/docs/StoreApi.md
+++ b/samples/client/petstore/csharp/OpenAPIClient/docs/StoreApi.md
@@ -170,7 +170,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/StoreApi.cs
index 576706c3d2c0..7450a0aa3021 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/StoreApi.cs
@@ -69,7 +69,7 @@ public interface IStoreApi : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -80,7 +80,7 @@ public interface IStoreApi : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -157,7 +157,7 @@ public interface IStoreApi : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -169,7 +169,7 @@ public interface IStoreApi : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -575,7 +575,7 @@ public ApiResponse> GetInventoryWithHttpInfo ()
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -587,7 +587,7 @@ public Order GetOrderById (long orderId)
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -642,7 +642,7 @@ public ApiResponse GetOrderByIdWithHttpInfo (long orderId)
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -656,7 +656,7 @@ public ApiResponse GetOrderByIdWithHttpInfo (long orderId)
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/build.sh b/samples/client/petstore/csharp/OpenAPIClientNet35/build.sh
index 979703be7f03..62b1cd3f4977 100644
--- a/samples/client/petstore/csharp/OpenAPIClientNet35/build.sh
+++ b/samples/client/petstore/csharp/OpenAPIClientNet35/build.sh
@@ -5,7 +5,7 @@
 
 frameworkVersion=net35
 
-# sdk must match installed framworks under PREFIX/lib/mono/[value]
+# sdk must match installed frameworks under PREFIX/lib/mono/[value]
 sdk=4
 
 # langversion refers to C# language features. see man mcs for details.
diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/docs/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClientNet35/docs/FakeApi.md
index 2953700acb83..47853770985a 100644
--- a/samples/client/petstore/csharp/OpenAPIClientNet35/docs/FakeApi.md
+++ b/samples/client/petstore/csharp/OpenAPIClientNet35/docs/FakeApi.md
@@ -882,7 +882,7 @@ No authorization required
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 [[Back to top]](#)
 [[Back to API list]](../README.md#documentation-for-api-endpoints)
diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/docs/StoreApi.md b/samples/client/petstore/csharp/OpenAPIClientNet35/docs/StoreApi.md
index 57247772d4ff..ae123168a11d 100644
--- a/samples/client/petstore/csharp/OpenAPIClientNet35/docs/StoreApi.md
+++ b/samples/client/petstore/csharp/OpenAPIClientNet35/docs/StoreApi.md
@@ -168,7 +168,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/git_push.sh b/samples/client/petstore/csharp/OpenAPIClientNet35/git_push.sh
index ced3be2b0c7b..200e975d2120 100644
--- a/samples/client/petstore/csharp/OpenAPIClientNet35/git_push.sh
+++ b/samples/client/petstore/csharp/OpenAPIClientNet35/git_push.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update" "gitlab.com"
 
 git_user_id=$1
 git_repo_id=$2
diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/StoreApi.cs
index 305632deb679..1d7e5a84940e 100644
--- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/StoreApi.cs
@@ -69,7 +69,7 @@ public interface IStoreApi : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -80,7 +80,7 @@ public interface IStoreApi : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -348,7 +348,7 @@ public ApiResponse> GetInventoryWithHttpInfo ()
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -360,7 +360,7 @@ public Order GetOrderById (long orderId)
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
index 23e1a0c2e197..43ed169c6a1b 100644
--- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
+++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
@@ -45,7 +45,7 @@ public interface IReadableConfiguration
         /// 
         /// Gets the date time format.
         /// 
-        /// Date time foramt.
+        /// Date time format.
         string DateTimeFormat { get; }
 
         /// 
diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Org.OpenAPITools.nuspec b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Org.OpenAPITools.nuspec
index c9ccbe1a8242..c2528caadb9b 100644
--- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Org.OpenAPITools.nuspec
+++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Org.OpenAPITools.nuspec
@@ -12,7 +12,7 @@
         $author$
 
         
+             users to easily find other packages by the same owners.  -->
         $author$
         false
         false
diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/build.sh b/samples/client/petstore/csharp/OpenAPIClientNet40/build.sh
index 25d8bff1a0b6..bd7ed61518ce 100644
--- a/samples/client/petstore/csharp/OpenAPIClientNet40/build.sh
+++ b/samples/client/petstore/csharp/OpenAPIClientNet40/build.sh
@@ -5,7 +5,7 @@
 
 frameworkVersion=net40
 
-# sdk must match installed framworks under PREFIX/lib/mono/[value]
+# sdk must match installed frameworks under PREFIX/lib/mono/[value]
 sdk=4
 
 # langversion refers to C# language features. see man mcs for details.
diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/docs/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClientNet40/docs/FakeApi.md
index 2953700acb83..47853770985a 100644
--- a/samples/client/petstore/csharp/OpenAPIClientNet40/docs/FakeApi.md
+++ b/samples/client/petstore/csharp/OpenAPIClientNet40/docs/FakeApi.md
@@ -882,7 +882,7 @@ No authorization required
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 [[Back to top]](#)
 [[Back to API list]](../README.md#documentation-for-api-endpoints)
diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/docs/StoreApi.md b/samples/client/petstore/csharp/OpenAPIClientNet40/docs/StoreApi.md
index 57247772d4ff..ae123168a11d 100644
--- a/samples/client/petstore/csharp/OpenAPIClientNet40/docs/StoreApi.md
+++ b/samples/client/petstore/csharp/OpenAPIClientNet40/docs/StoreApi.md
@@ -168,7 +168,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/git_push.sh b/samples/client/petstore/csharp/OpenAPIClientNet40/git_push.sh
index ced3be2b0c7b..200e975d2120 100644
--- a/samples/client/petstore/csharp/OpenAPIClientNet40/git_push.sh
+++ b/samples/client/petstore/csharp/OpenAPIClientNet40/git_push.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update" "gitlab.com"
 
 git_user_id=$1
 git_repo_id=$2
diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Api/StoreApi.cs
index 8bb8873826ae..a8b3b38b0210 100644
--- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Api/StoreApi.cs
@@ -69,7 +69,7 @@ public interface IStoreApi : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -80,7 +80,7 @@ public interface IStoreApi : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -348,7 +348,7 @@ public ApiResponse> GetInventoryWithHttpInfo ()
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -360,7 +360,7 @@ public Order GetOrderById (long orderId)
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
index 23e1a0c2e197..43ed169c6a1b 100644
--- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
+++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
@@ -45,7 +45,7 @@ public interface IReadableConfiguration
         /// 
         /// Gets the date time format.
         /// 
-        /// Date time foramt.
+        /// Date time format.
         string DateTimeFormat { get; }
 
         /// 
diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Org.OpenAPITools.nuspec b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Org.OpenAPITools.nuspec
index c9ccbe1a8242..c2528caadb9b 100644
--- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Org.OpenAPITools.nuspec
+++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Org.OpenAPITools.nuspec
@@ -12,7 +12,7 @@
         $author$
 
         
+             users to easily find other packages by the same owners.  -->
         $author$
         false
         false
diff --git a/samples/client/petstore/csharp/OpenAPIClientNetCoreProject/docs/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClientNetCoreProject/docs/FakeApi.md
index 2953700acb83..47853770985a 100644
--- a/samples/client/petstore/csharp/OpenAPIClientNetCoreProject/docs/FakeApi.md
+++ b/samples/client/petstore/csharp/OpenAPIClientNetCoreProject/docs/FakeApi.md
@@ -882,7 +882,7 @@ No authorization required
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 [[Back to top]](#)
 [[Back to API list]](../README.md#documentation-for-api-endpoints)
diff --git a/samples/client/petstore/csharp/OpenAPIClientNetCoreProject/docs/StoreApi.md b/samples/client/petstore/csharp/OpenAPIClientNetCoreProject/docs/StoreApi.md
index 57247772d4ff..ae123168a11d 100644
--- a/samples/client/petstore/csharp/OpenAPIClientNetCoreProject/docs/StoreApi.md
+++ b/samples/client/petstore/csharp/OpenAPIClientNetCoreProject/docs/StoreApi.md
@@ -168,7 +168,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/csharp/OpenAPIClientNetCoreProject/git_push.sh b/samples/client/petstore/csharp/OpenAPIClientNetCoreProject/git_push.sh
index ced3be2b0c7b..200e975d2120 100644
--- a/samples/client/petstore/csharp/OpenAPIClientNetCoreProject/git_push.sh
+++ b/samples/client/petstore/csharp/OpenAPIClientNetCoreProject/git_push.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update" "gitlab.com"
 
 git_user_id=$1
 git_repo_id=$2
diff --git a/samples/client/petstore/csharp/OpenAPIClientNetCoreProject/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/OpenAPIClientNetCoreProject/src/Org.OpenAPITools/Api/StoreApi.cs
index a6e51e8e392c..e3a3ffbfc98f 100644
--- a/samples/client/petstore/csharp/OpenAPIClientNetCoreProject/src/Org.OpenAPITools/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp/OpenAPIClientNetCoreProject/src/Org.OpenAPITools/Api/StoreApi.cs
@@ -69,7 +69,7 @@ public interface IStoreApi : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -80,7 +80,7 @@ public interface IStoreApi : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -157,7 +157,7 @@ public interface IStoreApi : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -169,7 +169,7 @@ public interface IStoreApi : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -575,7 +575,7 @@ public ApiResponse> GetInventoryWithHttpInfo ()
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -587,7 +587,7 @@ public Order GetOrderById (long orderId)
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -642,7 +642,7 @@ public ApiResponse GetOrderByIdWithHttpInfo (long orderId)
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -656,7 +656,7 @@ public ApiResponse GetOrderByIdWithHttpInfo (long orderId)
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
diff --git a/samples/client/petstore/csharp/OpenAPIClientNetCoreProject/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClientNetCoreProject/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
index 23e1a0c2e197..43ed169c6a1b 100644
--- a/samples/client/petstore/csharp/OpenAPIClientNetCoreProject/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
+++ b/samples/client/petstore/csharp/OpenAPIClientNetCoreProject/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
@@ -45,7 +45,7 @@ public interface IReadableConfiguration
         /// 
         /// Gets the date time format.
         /// 
-        /// Date time foramt.
+        /// Date time format.
         string DateTimeFormat { get; }
 
         /// 
diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/docs/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClientNetStandard/docs/FakeApi.md
index 2953700acb83..47853770985a 100644
--- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/docs/FakeApi.md
+++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/docs/FakeApi.md
@@ -882,7 +882,7 @@ No authorization required
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 [[Back to top]](#)
 [[Back to API list]](../README.md#documentation-for-api-endpoints)
diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/docs/StoreApi.md b/samples/client/petstore/csharp/OpenAPIClientNetStandard/docs/StoreApi.md
index 57247772d4ff..ae123168a11d 100644
--- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/docs/StoreApi.md
+++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/docs/StoreApi.md
@@ -168,7 +168,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/git_push.sh b/samples/client/petstore/csharp/OpenAPIClientNetStandard/git_push.sh
index ced3be2b0c7b..200e975d2120 100644
--- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/git_push.sh
+++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/git_push.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update" "gitlab.com"
 
 git_user_id=$1
 git_repo_id=$2
diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Api/StoreApi.cs
index a6e51e8e392c..e3a3ffbfc98f 100644
--- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Api/StoreApi.cs
@@ -69,7 +69,7 @@ public interface IStoreApi : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -80,7 +80,7 @@ public interface IStoreApi : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -157,7 +157,7 @@ public interface IStoreApi : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -169,7 +169,7 @@ public interface IStoreApi : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -575,7 +575,7 @@ public ApiResponse> GetInventoryWithHttpInfo ()
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -587,7 +587,7 @@ public Order GetOrderById (long orderId)
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -642,7 +642,7 @@ public ApiResponse GetOrderByIdWithHttpInfo (long orderId)
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -656,7 +656,7 @@ public ApiResponse GetOrderByIdWithHttpInfo (long orderId)
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
index 23e1a0c2e197..43ed169c6a1b 100644
--- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
+++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
@@ -45,7 +45,7 @@ public interface IReadableConfiguration
         /// 
         /// Gets the date time format.
         /// 
-        /// Date time foramt.
+        /// Date time format.
         string DateTimeFormat { get; }
 
         /// 
diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/build.sh b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/build.sh
index f178f97386aa..ee26741580f6 100644
--- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/build.sh
+++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/build.sh
@@ -5,7 +5,7 @@
 
 frameworkVersion=net45
 
-# sdk must match installed framworks under PREFIX/lib/mono/[value]
+# sdk must match installed frameworks under PREFIX/lib/mono/[value]
 sdk=4.5.2-api
 
 # langversion refers to C# language features. see man mcs for details.
diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/docs/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/docs/FakeApi.md
index 2953700acb83..47853770985a 100644
--- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/docs/FakeApi.md
+++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/docs/FakeApi.md
@@ -882,7 +882,7 @@ No authorization required
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 [[Back to top]](#)
 [[Back to API list]](../README.md#documentation-for-api-endpoints)
diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/docs/StoreApi.md b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/docs/StoreApi.md
index 57247772d4ff..ae123168a11d 100644
--- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/docs/StoreApi.md
+++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/docs/StoreApi.md
@@ -168,7 +168,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/git_push.sh b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/git_push.sh
index ced3be2b0c7b..200e975d2120 100644
--- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/git_push.sh
+++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/git_push.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update" "gitlab.com"
 
 git_user_id=$1
 git_repo_id=$2
diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Api/StoreApi.cs
index afd12d05cb9b..d05925d2e45f 100644
--- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Api/StoreApi.cs
@@ -69,7 +69,7 @@ public interface IStoreApi : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -80,7 +80,7 @@ public interface IStoreApi : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -157,7 +157,7 @@ public interface IStoreApi : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -169,7 +169,7 @@ public interface IStoreApi : IApiAccessor
         /// Find purchase order by ID
         /// 
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -575,7 +575,7 @@ public ApiResponse> GetInventoryWithHttpInfo ()
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -587,7 +587,7 @@ public Order GetOrderById (long orderId)
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -642,7 +642,7 @@ public ApiResponse GetOrderByIdWithHttpInfo (long orderId)
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
@@ -656,7 +656,7 @@ public ApiResponse GetOrderByIdWithHttpInfo (long orderId)
         }
 
         /// 
-        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// 
         /// Thrown when fails to make API call
         /// ID of pet that needs to be fetched
diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
index 23e1a0c2e197..43ed169c6a1b 100644
--- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
+++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
@@ -45,7 +45,7 @@ public interface IReadableConfiguration
         /// 
         /// Gets the date time format.
         /// 
-        /// Date time foramt.
+        /// Date time format.
         string DateTimeFormat { get; }
 
         /// 
diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Org.OpenAPITools.nuspec b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Org.OpenAPITools.nuspec
index 49a1278cf4dd..a68da9335f3c 100644
--- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Org.OpenAPITools.nuspec
+++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Org.OpenAPITools.nuspec
@@ -12,7 +12,7 @@
         $author$
 
         
+             users to easily find other packages by the same owners.  -->
         $author$
         false
         false
diff --git a/samples/client/petstore/eiffel/docs/STORE_API.md b/samples/client/petstore/eiffel/docs/STORE_API.md
index d8c32e82aa27..369cde8bce25 100644
--- a/samples/client/petstore/eiffel/docs/STORE_API.md
+++ b/samples/client/petstore/eiffel/docs/STORE_API.md
@@ -73,7 +73,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 
 ### Parameters
diff --git a/samples/client/petstore/eiffel/gitpush.sh b/samples/client/petstore/eiffel/gitpush.sh
index ed374619b139..ae01b182ae9e 100644
--- a/samples/client/petstore/eiffel/gitpush.sh
+++ b/samples/client/petstore/eiffel/gitpush.sh
@@ -36,7 +36,7 @@ git_remote=`git remote`
 if [ "$git_remote" = "" ]; then # git remote not defined
 
     if [ "$GIT_TOKEN" = "" ]; then
-        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
         git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
     else
         git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
diff --git a/samples/client/petstore/eiffel/src/api/store_api.e b/samples/client/petstore/eiffel/src/api/store_api.e
index 40f9ce6bd740..ad376c23c076 100644
--- a/samples/client/petstore/eiffel/src/api/store_api.e
+++ b/samples/client/petstore/eiffel/src/api/store_api.e
@@ -90,7 +90,7 @@ feature -- API Access
 
 	order_by_id (order_id: INTEGER_64): detachable ORDER
 			-- Find purchase order by ID
-			-- For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+			-- For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 			-- 
 			-- argument: order_id ID of pet that needs to be fetched (required)
 			-- 
diff --git a/samples/client/petstore/eiffel/src/api_client.e b/samples/client/petstore/eiffel/src/api_client.e
index 068e94e68a80..b21198bfbe5d 100644
--- a/samples/client/petstore/eiffel/src/api_client.e
+++ b/samples/client/petstore/eiffel/src/api_client.e
@@ -49,7 +49,7 @@ feature -- Access
 			-- base path.
 
 	authentications: STRING_TABLE [AUTHENTICATION]
-			-- autentication table.
+			-- authentication table.
 
 feature -- Status Report
 
@@ -139,7 +139,7 @@ feature -- Helper: OAuth Authentication
 feature -- Query Parameter Helpers
 
 	parameter_to_tuple (a_collection_format, a_name: STRING; a_value: detachable ANY): LIST [TUPLE [name: STRING; value: STRING]]
-			-- A list of tuples with name and valule.
+			-- A list of tuples with name and value.
 			-- collectionFormat collection format (e.g. csv, tsv)
 			-- name Name
 			-- value Value
@@ -201,7 +201,7 @@ feature -- Query Parameter Helpers
 
 
 	parameter_to_string (a_param: detachable ANY): STRING
-			-- return the string representation of the givien object `a_param'.
+			-- return the string representation of the given object `a_param'.
 		do
 			if a_param = Void then
 				Result := ""
@@ -248,7 +248,7 @@ feature -- Query Parameter Helpers
 						-- dateTime	string	date-time	As defined by date-time - RFC3339
 					Result := date_time.date.debug_output
 				elseif attached {STRING_32} a_param as str_32 then
-						-- TODO check if this is a good convertion.
+						-- TODO check if this is a good conversion.
 					Result := str_32.to_string_8
 				elseif attached {STRING_8} a_param as str_8 then
 					Result := str_8
@@ -335,7 +335,7 @@ feature -- HTTP client: call api
 			-- Execute an HTTP request with the given options.
 			-- Relative path `a_path'
 			-- Method `a_method'  "GET", "HEAD", "OPTIONS", "POST", "PUT", "PATCH" and "DELETE"
-			-- A request `a_request' wth
+			-- A request `a_request' with
 			-- The query parameters: `query_params'.
 			-- The Header parameters: `header_params'.
 			-- The Request Body: `body' could be Void, object to be serialized using the serializer function `a_serializer' with a given content_type.
@@ -372,7 +372,7 @@ feature -- HTTP client: call api
 			elseif l_content_type.is_case_insensitive_equal ("application/x-www-form-urlencoded") then
 				add_form_data (l_context_executor, a_request.form_params)
 			elseif l_content_type.is_case_insensitive_equal ("multipart/form-data") then
-				-- add_mulipart_data (l_context_executor, a_form_params, l_content_type)
+				-- add_multipart_data (l_context_executor, a_form_params, l_content_type)
 				-- here we need a way to identify files.
 			elseif a_request.body = Void then
 				if a_method.is_case_insensitive_equal ("DELETE") then
@@ -409,7 +409,7 @@ feature -- HTTP client: call api
 
 
 	build_url (a_path: STRING_8; a_query_params: LIST [TUPLE [name: STRING; value: STRING]]): STRING_8
-			-- Build a relatative url to `base_path' with `a_path' and a list of
+			-- Build a relative url to `base_path' with `a_path' and a list of
 			-- query parameters `a_query_params'.
 		local
 			l_query: STRING
diff --git a/samples/client/petstore/eiffel/src/framework/auth/http_basic_auth.e b/samples/client/petstore/eiffel/src/framework/auth/http_basic_auth.e
index 531384f26713..958f79c80ecd 100644
--- a/samples/client/petstore/eiffel/src/framework/auth/http_basic_auth.e
+++ b/samples/client/petstore/eiffel/src/framework/auth/http_basic_auth.e
@@ -55,7 +55,7 @@ feature -- Access
 				attached user_name as l_username and then
 				attached password as l_password
 			then
-					-- TODO check if this convertion it's ok.
+					-- TODO check if this conversion it's ok.
 				a_header_params.force ("Basic " + (create {BASE64}).encoded_string (l_username.to_string_8 + ":" + l_password.to_string_8) , "Authorization")
 			end
    		end
diff --git a/samples/client/petstore/eiffel/src/framework/auth/oauth.e b/samples/client/petstore/eiffel/src/framework/auth/oauth.e
index 9d65636b460d..dc8648eac7fa 100644
--- a/samples/client/petstore/eiffel/src/framework/auth/oauth.e
+++ b/samples/client/petstore/eiffel/src/framework/auth/oauth.e
@@ -37,7 +37,7 @@ feature -- Change Element
    			-- .
 		do
 			if attached access_token as l_access_token then
-					-- TODO check if this convertion is ok.
+					-- TODO check if this conversion is ok.
 				a_header_params.force ("Bearer " + l_access_token.to_string_8,"Authorization" )
 			end
 		end
diff --git a/samples/client/petstore/eiffel/src/framework/serialization/api_deserializer.e b/samples/client/petstore/eiffel/src/framework/serialization/api_deserializer.e
index a986b8e7f359..fe52a9208cc9 100644
--- a/samples/client/petstore/eiffel/src/framework/serialization/api_deserializer.e
+++ b/samples/client/petstore/eiffel/src/framework/serialization/api_deserializer.e
@@ -19,7 +19,7 @@ class
 feature -- Access
 
 	deserializer (f: FUNCTION [TUPLE [content_type:READABLE_STRING_8; body:READABLE_STRING_8; type:TYPE [detachable ANY]], detachable ANY]; a_content_type: READABLE_STRING_8; a_body: READABLE_STRING_8; a_type:TYPE [detachable ANY]): detachable ANY
-			-- From a given response deserialize body `a_body' with conent_type `a_content_type' to a target object of type `a_type'.
+			-- From a given response deserialize body `a_body' with content_type `a_content_type' to a target object of type `a_type'.
 		do
 			Result := f.item ([a_content_type, a_body, a_type])
 		end
diff --git a/samples/client/petstore/eiffel/src/framework/serialization/api_serializer.e b/samples/client/petstore/eiffel/src/framework/serialization/api_serializer.e
index 0afafdf843f5..759bf4d5d379 100644
--- a/samples/client/petstore/eiffel/src/framework/serialization/api_serializer.e
+++ b/samples/client/petstore/eiffel/src/framework/serialization/api_serializer.e
@@ -22,7 +22,7 @@ feature -- Access
 	serializer (f: FUNCTION [TUPLE [content_type:READABLE_STRING_8; type:ANY],READABLE_STRING_8]; a_content_type: READABLE_STRING_8; a_type: ANY): STRING_8
 			-- Serialize an object of type `a_type' using the content type `a_content_type'.
 		do
-				-- TODO check if this convertion it's ok.
+				-- TODO check if this conversion it's ok.
 			Result := f.item ([a_content_type, a_type]).to_string_8
 		end
 end
diff --git a/samples/client/petstore/eiffel/src/framework/serialization/json_basic_reflector_deserializer.e b/samples/client/petstore/eiffel/src/framework/serialization/json_basic_reflector_deserializer.e
index 3a6f2b04c8bb..85dd642d485c 100644
--- a/samples/client/petstore/eiffel/src/framework/serialization/json_basic_reflector_deserializer.e
+++ b/samples/client/petstore/eiffel/src/framework/serialization/json_basic_reflector_deserializer.e
@@ -282,7 +282,7 @@ feature {NONE} -- Helpers: Object
 			l_field_static_types: like fields_infos
 		do
 			if Result = Void then
-					-- Updated to use the Type info insted of the type_field in JSON.
+					-- Updated to use the Type info instead of the type_field in JSON.
 					--  fn.same_string ({JSON_REFLECTOR_SERIALIZER}.type_field_name
 				if attached a_type then
 					l_type_name := a_type.name.to_string_8
diff --git a/samples/client/petstore/eiffel/test/apis/store_api_test.e b/samples/client/petstore/eiffel/test/apis/store_api_test.e
index e24849bf2901..354da75803eb 100644
--- a/samples/client/petstore/eiffel/test/apis/store_api_test.e
+++ b/samples/client/petstore/eiffel/test/apis/store_api_test.e
@@ -43,7 +43,7 @@ feature -- Test routines
     test_order_by_id
             -- Find purchase order by ID
             -- 
-            -- For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions 
+            -- For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions 
         local
             l_response: ORDER
             l_order_id: INTEGER_64
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/api/store.ex b/samples/client/petstore/elixir/lib/openapi_petstore/api/store.ex
index e8519031ef0e..ae694541fba0 100644
--- a/samples/client/petstore/elixir/lib/openapi_petstore/api/store.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/api/store.ex
@@ -71,7 +71,7 @@ defmodule OpenapiPetstore.Api.Store do
 
   @doc """
   Find purchase order by ID
-  For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+  For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
   ### Parameters
 
diff --git a/samples/client/petstore/erlang-client/src/petstore_store_api.erl b/samples/client/petstore/erlang-client/src/petstore_store_api.erl
index 0d59557dc98f..f95e36788d9b 100644
--- a/samples/client/petstore/erlang-client/src/petstore_store_api.erl
+++ b/samples/client/petstore/erlang-client/src/petstore_store_api.erl
@@ -50,7 +50,7 @@ get_inventory(Ctx, Optional) ->
     petstore_utils:request(Ctx, Method, [?BASE_URL, Path], QS, ContentTypeHeader++Headers, Body1, Opts, Cfg).
 
 %% @doc Find purchase order by ID
-%% For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+%% For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 -spec get_order_by_id(ctx:ctx(), integer()) -> {ok, petstore_order:petstore_order(), petstore_utils:response_info()} | {ok, hackney:client_ref()} | {error, term(), petstore_utils:response_info()}.
 get_order_by_id(Ctx, OrderId) ->
     get_order_by_id(Ctx, OrderId, #{}).
diff --git a/samples/client/petstore/go/go-petstore/api/openapi.yaml b/samples/client/petstore/go/go-petstore/api/openapi.yaml
index 16c9dca0ae87..ee7adb4d6c6f 100644
--- a/samples/client/petstore/go/go-petstore/api/openapi.yaml
+++ b/samples/client/petstore/go/go-petstore/api/openapi.yaml
@@ -354,7 +354,7 @@ paths:
       - store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -641,7 +641,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/client/petstore/go/go-petstore/api_store.go b/samples/client/petstore/go/go-petstore/api_store.go
index 3ad1421086f8..30e71c681f32 100644
--- a/samples/client/petstore/go/go-petstore/api_store.go
+++ b/samples/client/petstore/go/go-petstore/api_store.go
@@ -53,7 +53,7 @@ type StoreApi interface {
 	/*
 	GetOrderById Find purchase order by ID
 
-	For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+	For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
 	@param orderId ID of pet that needs to be fetched
@@ -299,7 +299,7 @@ func (r ApiGetOrderByIdRequest) Execute() (*Order, *http.Response, error) {
 /*
 GetOrderById Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
  @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
  @param orderId ID of pet that needs to be fetched
diff --git a/samples/client/petstore/go/user_api_test.go b/samples/client/petstore/go/user_api_test.go
index 52195d6caac9..6ae3fc25950c 100644
--- a/samples/client/petstore/go/user_api_test.go
+++ b/samples/client/petstore/go/user_api_test.go
@@ -131,7 +131,7 @@ func TestUpdateUser(t *testing.T) {
 		t.Log(apiResponse)
 	}
 
-	//verify changings are correct
+	//verify changes are correct
 	resp, apiResponse, err := client.UserApi.GetUserByName(context.Background(), "gopher").Execute()
 	if err != nil {
 		t.Fatalf("Error while getting user by id: %v", err)
diff --git a/samples/client/petstore/haskell-http-client/docs/OpenAPIPetstore-API-Store.html b/samples/client/petstore/haskell-http-client/docs/OpenAPIPetstore-API-Store.html
index 1aea9bc37562..c07d420ddd41 100644
--- a/samples/client/petstore/haskell-http-client/docs/OpenAPIPetstore-API-Store.html
+++ b/samples/client/petstore/haskell-http-client/docs/OpenAPIPetstore-API-Store.html
@@ -1 +1 @@
-OpenAPIPetstore.API.Store
openapi-petstore-0.1.0.0: Auto-generated openapi-petstore API Client
Safe HaskellSafe-Inferred
LanguageHaskell2010
OpenAPIPetstore.API.Store
Description
 
Operations
Store
deleteOrder
deleteOrder Source #
Arguments
:: OrderIdText
"orderId" -  ID of the order that needs to be deleted
-> OpenAPIPetstoreRequest DeleteOrder MimeNoContent NoContent MimeNoContent 
DELETE /store/order/{order_id}
Delete purchase order by ID
For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
data DeleteOrder Source #
Instances
Instances details
 Produces DeleteOrder MimeNoContent Source # 
Instance details
Defined in OpenAPIPetstore.API.Store
getInventory
getInventory :: OpenAPIPetstoreRequest GetInventory MimeNoContent (Map String Int) MimeJSON Source #
GET /store/inventory
Returns pet inventories by status
Returns a map of status codes to quantities
AuthMethod: AuthApiKeyApiKey
data GetInventory Source #
Instances
Instances details
 Produces GetInventory MimeJSON Source #
application/json
Instance details
Defined in OpenAPIPetstore.API.Store
getOrderById
getOrderById Source #
Arguments
:: Accept accept
request accept (MimeType)
-> OrderId
"orderId" -  ID of pet that needs to be fetched
-> OpenAPIPetstoreRequest GetOrderById MimeNoContent Order accept 
GET /store/order/{order_id}
Find purchase order by ID
For valid response try integer IDs with value 5 or 10. Other values will generated exceptions
data GetOrderById Source #
Instances
Instances details
 Produces GetOrderById MimeJSON Source #
application/json
Instance details
Defined in OpenAPIPetstore.API.Store
 Produces GetOrderById MimeXML Source #
application/xml
Instance details
Defined in OpenAPIPetstore.API.Store
placeOrder
placeOrder Source #
Arguments
:: (Consumes PlaceOrder contentType, MimeRender contentType Order) 
=> ContentType contentType
request content-type (MimeType)
-> Accept accept
request accept (MimeType)
-> Order
"body" -  order placed for purchasing the pet
-> OpenAPIPetstoreRequest PlaceOrder contentType Order accept 
POST /store/order
Place an order for a pet
data PlaceOrder Source #
Instances
Instances details
 HasBodyParam PlaceOrder Order Source #
Body Param "body" - order placed for purchasing the pet
Instance details
Defined in OpenAPIPetstore.API.Store
 
Methods
setBodyParam :: (Consumes PlaceOrder contentType, MimeRender contentType Order) => OpenAPIPetstoreRequest PlaceOrder contentType res accept -> Order -> OpenAPIPetstoreRequest PlaceOrder contentType res accept Source #
 MimeType mtype => Consumes PlaceOrder mtype Source #
*/*
Instance details
Defined in OpenAPIPetstore.API.Store
 Produces PlaceOrder MimeJSON Source #
application/json
Instance details
Defined in OpenAPIPetstore.API.Store
 Produces PlaceOrder MimeXML Source #
application/xml
Instance details
Defined in OpenAPIPetstore.API.Store

\ No newline at end of file
+OpenAPIPetstore.API.Store
openapi-petstore-0.1.0.0: Auto-generated openapi-petstore API Client
Safe HaskellSafe-Inferred
LanguageHaskell2010
OpenAPIPetstore.API.Store
Description
 
Operations
Store
deleteOrder
deleteOrder Source #
Arguments
:: OrderIdText
"orderId" -  ID of the order that needs to be deleted
-> OpenAPIPetstoreRequest DeleteOrder MimeNoContent NoContent MimeNoContent 
DELETE /store/order/{order_id}
Delete purchase order by ID
For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
data DeleteOrder Source #
Instances
Instances details
 Produces DeleteOrder MimeNoContent Source # 
Instance details
Defined in OpenAPIPetstore.API.Store
getInventory
getInventory :: OpenAPIPetstoreRequest GetInventory MimeNoContent (Map String Int) MimeJSON Source #
GET /store/inventory
Returns pet inventories by status
Returns a map of status codes to quantities
AuthMethod: AuthApiKeyApiKey
data GetInventory Source #
Instances
Instances details
 Produces GetInventory MimeJSON Source #
application/json
Instance details
Defined in OpenAPIPetstore.API.Store
getOrderById
getOrderById Source #
Arguments
:: Accept accept
request accept (MimeType)
-> OrderId
"orderId" -  ID of pet that needs to be fetched
-> OpenAPIPetstoreRequest GetOrderById MimeNoContent Order accept 
GET /store/order/{order_id}
Find purchase order by ID
For valid response try integer IDs with value 5 or 10. Other values will generate exceptions
data GetOrderById Source #
Instances
Instances details
 Produces GetOrderById MimeJSON Source #
application/json
Instance details
Defined in OpenAPIPetstore.API.Store
 Produces GetOrderById MimeXML Source #
application/xml
Instance details
Defined in OpenAPIPetstore.API.Store
placeOrder
placeOrder Source #
Arguments
:: (Consumes PlaceOrder contentType, MimeRender contentType Order) 
=> ContentType contentType
request content-type (MimeType)
-> Accept accept
request accept (MimeType)
-> Order
"body" -  order placed for purchasing the pet
-> OpenAPIPetstoreRequest PlaceOrder contentType Order accept 
POST /store/order
Place an order for a pet
data PlaceOrder Source #
Instances
Instances details
 HasBodyParam PlaceOrder Order Source #
Body Param "body" - order placed for purchasing the pet
Instance details
Defined in OpenAPIPetstore.API.Store
 
Methods
setBodyParam :: (Consumes PlaceOrder contentType, MimeRender contentType Order) => OpenAPIPetstoreRequest PlaceOrder contentType res accept -> Order -> OpenAPIPetstoreRequest PlaceOrder contentType res accept Source #
 MimeType mtype => Consumes PlaceOrder mtype Source #
*/*
Instance details
Defined in OpenAPIPetstore.API.Store
 Produces PlaceOrder MimeJSON Source #
application/json
Instance details
Defined in OpenAPIPetstore.API.Store
 Produces PlaceOrder MimeXML Source #
application/xml
Instance details
Defined in OpenAPIPetstore.API.Store

\ No newline at end of file
diff --git a/samples/client/petstore/haskell-http-client/docs/linuwial.css b/samples/client/petstore/haskell-http-client/docs/linuwial.css
index cbb58a0389df..0e64da3e3896 100644
--- a/samples/client/petstore/haskell-http-client/docs/linuwial.css
+++ b/samples/client/petstore/haskell-http-client/docs/linuwial.css
@@ -755,7 +755,7 @@ table.info {
 
 /* @end */
 
-/* @group Auxillary Pages */
+/* @group Auxiliary Pages */
 
 
 .extension-list {
diff --git a/samples/client/petstore/haskell-http-client/docs/ocean.css b/samples/client/petstore/haskell-http-client/docs/ocean.css
index ba6af9ca2cf2..d63c39a75989 100644
--- a/samples/client/petstore/haskell-http-client/docs/ocean.css
+++ b/samples/client/petstore/haskell-http-client/docs/ocean.css
@@ -546,7 +546,7 @@ div#style-menu-holder {
 
 /* @end */
 
-/* @group Auxillary Pages */
+/* @group Auxiliary Pages */
 
 
 .extension-list {
diff --git a/samples/client/petstore/haskell-http-client/docs/openapi-petstore.txt b/samples/client/petstore/haskell-http-client/docs/openapi-petstore.txt
index 5275a8584763..58ca1598da56 100644
--- a/samples/client/petstore/haskell-http-client/docs/openapi-petstore.txt
+++ b/samples/client/petstore/haskell-http-client/docs/openapi-petstore.txt
@@ -2434,7 +2434,7 @@ data GetInventory
 --   Find purchase order by ID
 --   
 --   For valid response try integer IDs with value 5 or 10. Other
---   values will generated exceptions
+--   values will generate exceptions
 getOrderById :: Accept accept -> OrderId -> OpenAPIPetstoreRequest GetOrderById MimeNoContent Order accept
 data GetOrderById
 
diff --git a/samples/client/petstore/haskell-http-client/docs/src/OpenAPIPetstore.API.Store.html b/samples/client/petstore/haskell-http-client/docs/src/OpenAPIPetstore.API.Store.html
index 431b0d346d0b..d93d118f8023 100644
--- a/samples/client/petstore/haskell-http-client/docs/src/OpenAPIPetstore.API.Store.html
+++ b/samples/client/petstore/haskell-http-client/docs/src/OpenAPIPetstore.API.Store.html
@@ -143,7 +143,7 @@
 -- 
 -- Find purchase order by ID
 -- 
--- For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+-- For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 -- 
 getOrderById
   :: Accept accept -- ^ request accept ('MimeType')
diff --git a/samples/client/petstore/haskell-http-client/example-app/Main.hs b/samples/client/petstore/haskell-http-client/example-app/Main.hs
index 9554b1a1a745..ba3fccd6d1c2 100644
--- a/samples/client/petstore/haskell-http-client/example-app/Main.hs
+++ b/samples/client/petstore/haskell-http-client/example-app/Main.hs
@@ -70,7 +70,7 @@ runPet mgr config = do
   -- -- No instance for (S.Produces S.AddPet S.MimePlainText)
   -- addPetResponse <- S.dispatchLbs mgr config addPetRequest
 
-  -- inspect the AddPet type to see typeclasses indicating wihch
+  -- inspect the AddPet type to see typeclasses indicating which
   -- content-type and accept types (mimeTypes) are valid
 
   -- :i S.AddPet
@@ -122,7 +122,7 @@ runPet mgr config = do
                 }
         _ <- S.dispatchLbs mgr config updatePetRequest
 
-        -- requred parameters are included as function arguments, optional parameters are included with applyOptionalParam
+        -- required parameters are included as function arguments, optional parameters are included with applyOptionalParam
         -- inspect the UpdatePetWithForm type to see typeclasses indicating optional paramteters (:i S.UpdatePetWithForm)
         -- instance S.HasOptionalParam S.UpdatePetWithForm S.Name
         --   -- Defined in ‘OpenAPIPetstore.API’
diff --git a/samples/client/petstore/haskell-http-client/lib/OpenAPIPetstore/API/Store.hs b/samples/client/petstore/haskell-http-client/lib/OpenAPIPetstore/API/Store.hs
index 971d8d039b9e..8036e7f02f1c 100644
--- a/samples/client/petstore/haskell-http-client/lib/OpenAPIPetstore/API/Store.hs
+++ b/samples/client/petstore/haskell-http-client/lib/OpenAPIPetstore/API/Store.hs
@@ -102,7 +102,7 @@ instance Produces GetInventory MimeJSON
 -- 
 -- Find purchase order by ID
 -- 
--- For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+-- For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 -- 
 getOrderById
   :: Accept accept -- ^ request accept ('MimeType')
diff --git a/samples/client/petstore/haskell-http-client/openapi.yaml b/samples/client/petstore/haskell-http-client/openapi.yaml
index 16c9dca0ae87..ee7adb4d6c6f 100644
--- a/samples/client/petstore/haskell-http-client/openapi.yaml
+++ b/samples/client/petstore/haskell-http-client/openapi.yaml
@@ -354,7 +354,7 @@ paths:
       - store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -641,7 +641,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/client/petstore/java-helidon-client/mp/docs/FakeApi.md b/samples/client/petstore/java-helidon-client/mp/docs/FakeApi.md
index 9dfe49d51cce..6ae181e21c67 100644
--- a/samples/client/petstore/java-helidon-client/mp/docs/FakeApi.md
+++ b/samples/client/petstore/java-helidon-client/mp/docs/FakeApi.md
@@ -533,7 +533,7 @@ Fake endpoint to test group parameters (optional)
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 
 ## testInlineAdditionalProperties
diff --git a/samples/client/petstore/java-helidon-client/mp/docs/StoreApi.md b/samples/client/petstore/java-helidon-client/mp/docs/StoreApi.md
index 299fb326568c..f306d5948ccb 100644
--- a/samples/client/petstore/java-helidon-client/mp/docs/StoreApi.md
+++ b/samples/client/petstore/java-helidon-client/mp/docs/StoreApi.md
@@ -85,7 +85,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Parameters
 
diff --git a/samples/client/petstore/java-helidon-client/mp/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java-helidon-client/mp/src/main/java/org/openapitools/client/api/StoreApi.java
index ff2dfbfbca60..b6f3f383a4d2 100644
--- a/samples/client/petstore/java-helidon-client/mp/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java-helidon-client/mp/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -56,7 +56,7 @@ public interface StoreApi  {
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      */
     @GET
     @Path("/order/{order_id}")
diff --git a/samples/client/petstore/java-helidon-client/mp/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java-helidon-client/mp/src/test/java/org/openapitools/client/api/StoreApiTest.java
index 4331d26aa942..f9a8bd7ab11b 100644
--- a/samples/client/petstore/java-helidon-client/mp/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java-helidon-client/mp/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -78,7 +78,7 @@ public void getInventoryTest() throws Exception {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @throws ApiException
      *          if the Api call fails
diff --git a/samples/client/petstore/java-helidon-client/se/docs/FakeApi.md b/samples/client/petstore/java-helidon-client/se/docs/FakeApi.md
index 1b6b9507990d..853a8de53777 100644
--- a/samples/client/petstore/java-helidon-client/se/docs/FakeApi.md
+++ b/samples/client/petstore/java-helidon-client/se/docs/FakeApi.md
@@ -1001,7 +1001,7 @@ null (empty response body)
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 
 ## testInlineAdditionalProperties
diff --git a/samples/client/petstore/java-helidon-client/se/docs/StoreApi.md b/samples/client/petstore/java-helidon-client/se/docs/StoreApi.md
index e3b7d7b910cc..ce91137cc6f4 100644
--- a/samples/client/petstore/java-helidon-client/se/docs/StoreApi.md
+++ b/samples/client/petstore/java-helidon-client/se/docs/StoreApi.md
@@ -152,7 +152,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/api/StoreApi.java
index b7ad3ea6e83e..a71be4f7616f 100644
--- a/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java-helidon-client/se/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -41,7 +41,7 @@ public interface StoreApi {
 
  /**
   * Find purchase order by ID
-  * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+  * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
   * @param orderId ID of pet that needs to be fetched (required)
   * @return {@code ApiResponse}
   */
diff --git a/samples/client/petstore/java-helidon-client/se/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java-helidon-client/se/src/test/java/org/openapitools/client/api/StoreApiTest.java
index 352767de98a0..438c8b57b83a 100644
--- a/samples/client/petstore/java-helidon-client/se/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java-helidon-client/se/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -89,7 +89,7 @@ public void getInventoryTest() {
 
    /**
     * Find purchase order by ID
-    * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
     */
     @Test
     public void getOrderByIdTest() {
diff --git a/samples/client/petstore/java-micronaut-client/docs/apis/StoreApi.md b/samples/client/petstore/java-micronaut-client/docs/apis/StoreApi.md
index cad3ef78ef42..07337a34e418 100644
--- a/samples/client/petstore/java-micronaut-client/docs/apis/StoreApi.md
+++ b/samples/client/petstore/java-micronaut-client/docs/apis/StoreApi.md
@@ -92,7 +92,7 @@ Mono StoreApi.getOrderById(orderId)
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Parameters
 | Name | Type | Description  | Notes |
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/StoreApi.java
index 6ee9bf5bf332..6f5b00148124 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/StoreApi.java
@@ -53,7 +53,7 @@ Mono deleteOrder(
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return Order
diff --git a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/api/StoreApiSpec.groovy b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/api/StoreApiSpec.groovy
index 157f85ee7c77..cdeb7c148541 100644
--- a/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/api/StoreApiSpec.groovy
+++ b/samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/api/StoreApiSpec.groovy
@@ -48,7 +48,7 @@ public class StoreApiSpec extends Specification {
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      */
     void "getOrderById() test"() {
         when:
diff --git a/samples/client/petstore/java/apache-httpclient/api/openapi.yaml b/samples/client/petstore/java/apache-httpclient/api/openapi.yaml
index 5f55e8c53f47..e7e17402f6fd 100644
--- a/samples/client/petstore/java/apache-httpclient/api/openapi.yaml
+++ b/samples/client/petstore/java/apache-httpclient/api/openapi.yaml
@@ -370,7 +370,7 @@ paths:
       x-accepts: application/json
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -672,7 +672,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/client/petstore/java/apache-httpclient/docs/FakeApi.md b/samples/client/petstore/java/apache-httpclient/docs/FakeApi.md
index 25301e7502c3..627366e41db3 100644
--- a/samples/client/petstore/java/apache-httpclient/docs/FakeApi.md
+++ b/samples/client/petstore/java/apache-httpclient/docs/FakeApi.md
@@ -796,7 +796,7 @@ No authorization required
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 
 ## testInlineAdditionalProperties
diff --git a/samples/client/petstore/java/apache-httpclient/docs/StoreApi.md b/samples/client/petstore/java/apache-httpclient/docs/StoreApi.md
index 571e808abdfb..b64e208a83a3 100644
--- a/samples/client/petstore/java/apache-httpclient/docs/StoreApi.md
+++ b/samples/client/petstore/java/apache-httpclient/docs/StoreApi.md
@@ -152,7 +152,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/StoreApi.java
index 82a77bb2217b..29b92b46e2bb 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -157,7 +157,7 @@ public Map getInventory() throws ApiException {
   }
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    * @param orderId ID of pet that needs to be fetched (required)
    * @return Order
    * @throws ApiException if fails to make API call
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/api/StoreApiTest.java
index fb91b870c591..c7df74110dbc 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -64,7 +64,7 @@ public void getInventoryTest() throws ApiException {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @throws ApiException
      *          if the Api call fails
diff --git a/samples/client/petstore/java/feign-no-nullable/api/openapi.yaml b/samples/client/petstore/java/feign-no-nullable/api/openapi.yaml
index 5f55e8c53f47..e7e17402f6fd 100644
--- a/samples/client/petstore/java/feign-no-nullable/api/openapi.yaml
+++ b/samples/client/petstore/java/feign-no-nullable/api/openapi.yaml
@@ -370,7 +370,7 @@ paths:
       x-accepts: application/json
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -672,7 +672,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/api/StoreApi.java
index 9b821d4302d4..e88030d0db43 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -68,7 +68,7 @@ public interface StoreApi extends ApiClient.Api {
 
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    * @param orderId ID of pet that needs to be fetched (required)
    * @return Order
    */
@@ -81,7 +81,7 @@ public interface StoreApi extends ApiClient.Api {
   /**
    * Find purchase order by ID
    * Similar to getOrderById but it also returns the http response headers .
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    * @param orderId ID of pet that needs to be fetched (required)
    * @return A ApiResponse that wraps the response boyd and the http headers.
    */
diff --git a/samples/client/petstore/java/feign-no-nullable/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/feign-no-nullable/src/test/java/org/openapitools/client/api/StoreApiTest.java
index fbbea2cd5e84..8ceab0a33154 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -53,7 +53,7 @@ void getInventoryTest() {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      */
     @Test
     void getOrderByIdTest() {
diff --git a/samples/client/petstore/java/feign/api/openapi.yaml b/samples/client/petstore/java/feign/api/openapi.yaml
index f54c98c7f7bf..f9cbedf1e42f 100644
--- a/samples/client/petstore/java/feign/api/openapi.yaml
+++ b/samples/client/petstore/java/feign/api/openapi.yaml
@@ -412,7 +412,7 @@ paths:
       x-accepts: application/json
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -712,7 +712,7 @@ paths:
         style: form
       responses:
         "400":
-          description: Someting wrong
+          description: Something wrong
       security:
       - bearer_test: []
       summary: Fake endpoint to test group parameters (optional)
diff --git a/samples/client/petstore/java/feign/feign10x/api/openapi.yaml b/samples/client/petstore/java/feign/feign10x/api/openapi.yaml
index d9ad8bac2b6b..36d0772340fd 100644
--- a/samples/client/petstore/java/feign/feign10x/api/openapi.yaml
+++ b/samples/client/petstore/java/feign/feign10x/api/openapi.yaml
@@ -383,7 +383,7 @@ paths:
       x-accepts: application/json
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -685,7 +685,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/client/petstore/java/feign/feign10x/git_push.sh b/samples/client/petstore/java/feign/feign10x/git_push.sh
index ced3be2b0c7b..200e975d2120 100644
--- a/samples/client/petstore/java/feign/feign10x/git_push.sh
+++ b/samples/client/petstore/java/feign/feign10x/git_push.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update" "gitlab.com"
 
 git_user_id=$1
 git_repo_id=$2
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/ApiClient.java
index 4e256daf6b29..d66098cc7dd7 100644
--- a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/ApiClient.java
@@ -332,7 +332,7 @@ public void registerAccessTokenListener(AccessTokenListener accessTokenListener)
 
   /**
    * Gets request interceptor based on authentication name
-   * @param authName Authentiation name
+   * @param authName Authentication name
    * @return Request Interceptor
    */
   public RequestInterceptor getAuthorization(String authName) {
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/ServerConfiguration.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/ServerConfiguration.java
index a1107a8690e4..e08da9aac7dd 100644
--- a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/ServerConfiguration.java
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/ServerConfiguration.java
@@ -12,7 +12,7 @@ public class ServerConfiguration {
 
     /**
      * @param URL A URL to the target host.
-     * @param description A describtion of the host designated by the URL.
+     * @param description A description of the host designated by the URL.
      * @param variables A map between a variable name and its value. The value is used for substitution in the server's URL template.
      */
     public ServerConfiguration(String URL, String description, Map variables) {
diff --git a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/api/StoreApi.java
index 5ba8227e99b6..3312ed1e15d1 100644
--- a/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/feign/feign10x/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -39,7 +39,7 @@ public interface StoreApi extends ApiClient.Api {
 
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    * @param orderId ID of pet that needs to be fetched (required)
    * @return Order
    */
diff --git a/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/api/StoreApiTest.java
index bdb0b7a1e096..79f40ef39d86 100644
--- a/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/feign/feign10x/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -53,7 +53,7 @@ public void getInventoryTest() {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      */
     @Test
     public void getOrderByIdTest() {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/StoreApi.java
index c5cefaa7a4b5..7a4bfd120f11 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -68,7 +68,7 @@ public interface StoreApi extends ApiClient.Api {
 
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    * @param orderId ID of pet that needs to be fetched (required)
    * @return Order
    */
@@ -81,7 +81,7 @@ public interface StoreApi extends ApiClient.Api {
   /**
    * Find purchase order by ID
    * Similar to getOrderById but it also returns the http response headers .
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    * @param orderId ID of pet that needs to be fetched (required)
    * @return A ApiResponse that wraps the response boyd and the http headers.
    */
diff --git a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/api/StoreApiTest.java
index 68a9388a03a0..c1c751847cc0 100644
--- a/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/feign/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -91,7 +91,7 @@ void getInventoryTest() {
   /**
    * Find purchase order by ID
    * 

-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    */
   @Test
   void getOrderByIdTest() {
diff --git a/samples/client/petstore/java/google-api-client/api/openapi.yaml b/samples/client/petstore/java/google-api-client/api/openapi.yaml
index 5f55e8c53f47..e7e17402f6fd 100644
--- a/samples/client/petstore/java/google-api-client/api/openapi.yaml
+++ b/samples/client/petstore/java/google-api-client/api/openapi.yaml
@@ -370,7 +370,7 @@ paths:
       x-accepts: application/json
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -672,7 +672,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/client/petstore/java/google-api-client/docs/FakeApi.md b/samples/client/petstore/java/google-api-client/docs/FakeApi.md
index 25301e7502c3..627366e41db3 100644
--- a/samples/client/petstore/java/google-api-client/docs/FakeApi.md
+++ b/samples/client/petstore/java/google-api-client/docs/FakeApi.md
@@ -796,7 +796,7 @@ No authorization required
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 
 ## testInlineAdditionalProperties
diff --git a/samples/client/petstore/java/google-api-client/docs/StoreApi.md b/samples/client/petstore/java/google-api-client/docs/StoreApi.md
index 571e808abdfb..b64e208a83a3 100644
--- a/samples/client/petstore/java/google-api-client/docs/StoreApi.md
+++ b/samples/client/petstore/java/google-api-client/docs/StoreApi.md
@@ -152,7 +152,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeApi.java
index daf6e2d718aa..e80816d9678c 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -970,7 +970,7 @@ public HttpResponse testEnumParametersForHttpResponse(Map params
   /**
     * Fake endpoint to test group parameters (optional)
     * Fake endpoint to test group parameters (optional)
-    * 
400 - Someting wrong
+    * 
400 - Something wrong
     * @param requiredStringGroup Required String in group parameters
     * @param requiredBooleanGroup Required Boolean in group parameters
     * @param requiredInt64Group Required Integer in group parameters
@@ -986,7 +986,7 @@ public void testGroupParameters(Integer requiredStringGroup, Boolean requiredBoo
   /**
     * Fake endpoint to test group parameters (optional)
     * Fake endpoint to test group parameters (optional)
-    * 
400 - Someting wrong
+    * 
400 - Something wrong
     * @param requiredStringGroup Required String in group parameters
     * @param requiredBooleanGroup Required Boolean in group parameters
     * @param requiredInt64Group Required Integer in group parameters
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/StoreApi.java
index 2ba19aa3b658..c2c5c34d26d0 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -189,7 +189,7 @@ public HttpResponse getInventoryForHttpResponse(Map params) thro
 
   /**
     * Find purchase order by ID
-    * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
     * 
200 - successful operation
     * 
400 - Invalid ID supplied
     * 
404 - Order not found
@@ -205,7 +205,7 @@ public Order getOrderById(Long orderId) throws IOException {
 
   /**
     * Find purchase order by ID
-    * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
     * 
200 - successful operation
     * 
400 - Invalid ID supplied
     * 
404 - Order not found
diff --git a/samples/client/petstore/java/google-api-client/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/google-api-client/src/test/java/org/openapitools/client/api/StoreApiTest.java
index 54fb142817d8..fd77cfec629c 100644
--- a/samples/client/petstore/java/google-api-client/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/google-api-client/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -66,7 +66,7 @@ public void getInventoryTest() throws IOException {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @throws IOException
      *          if the Api call fails
diff --git a/samples/client/petstore/java/jersey1/api/openapi.yaml b/samples/client/petstore/java/jersey1/api/openapi.yaml
index 5f55e8c53f47..e7e17402f6fd 100644
--- a/samples/client/petstore/java/jersey1/api/openapi.yaml
+++ b/samples/client/petstore/java/jersey1/api/openapi.yaml
@@ -370,7 +370,7 @@ paths:
       x-accepts: application/json
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -672,7 +672,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/client/petstore/java/jersey1/docs/FakeApi.md b/samples/client/petstore/java/jersey1/docs/FakeApi.md
index 25301e7502c3..627366e41db3 100644
--- a/samples/client/petstore/java/jersey1/docs/FakeApi.md
+++ b/samples/client/petstore/java/jersey1/docs/FakeApi.md
@@ -796,7 +796,7 @@ No authorization required
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 
 ## testInlineAdditionalProperties
diff --git a/samples/client/petstore/java/jersey1/docs/StoreApi.md b/samples/client/petstore/java/jersey1/docs/StoreApi.md
index 571e808abdfb..b64e208a83a3 100644
--- a/samples/client/petstore/java/jersey1/docs/StoreApi.md
+++ b/samples/client/petstore/java/jersey1/docs/StoreApi.md
@@ -152,7 +152,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/StoreApi.java
index bc68e36d8b4c..db9decedc4b0 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -132,7 +132,7 @@ public Map getInventory() throws ApiException {
       }
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    * @param orderId ID of pet that needs to be fetched (required)
    * @return Order
    * @throws ApiException if fails to make API call
diff --git a/samples/client/petstore/java/jersey1/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/jersey1/src/test/java/org/openapitools/client/api/StoreApiTest.java
index f83e6c38972d..a43d64debf1d 100644
--- a/samples/client/petstore/java/jersey1/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/jersey1/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -66,7 +66,7 @@ public void getInventoryTest() throws ApiException {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @throws ApiException
      *          if the Api call fails
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/api/openapi.yaml b/samples/client/petstore/java/jersey2-java8-localdatetime/api/openapi.yaml
index 5f55e8c53f47..e7e17402f6fd 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/api/openapi.yaml
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/api/openapi.yaml
@@ -370,7 +370,7 @@ paths:
       x-accepts: application/json
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -672,7 +672,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/FakeApi.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/FakeApi.md
index 438fa9fae14c..d21432dbf3e4 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/FakeApi.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/FakeApi.md
@@ -800,7 +800,7 @@ No authorization required
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 
 ## testInlineAdditionalProperties
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/StoreApi.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/StoreApi.md
index 7e88578e3c5b..e0b1be10cdf4 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/StoreApi.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/StoreApi.md
@@ -150,7 +150,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/FakeApi.java
index 6c1055a81fe9..fc418490a4ab 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -925,7 +925,7 @@ public APItestGroupParametersRequest int64Group(Long int64Group) {
      * @http.response.details
        
-         
+         

          
 Status Code  Description  Response Headers 
 400  Someting wrong   -  
 400  Something wrong   -  

        

      
      */
@@ -941,7 +941,7 @@ public void execute() throws ApiException {
      * @http.response.details
        
-         
+         

          
 Status Code  Description  Response Headers 
 400  Someting wrong   -  
 400  Something wrong   -  

        

 
      */
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/StoreApi.java
index 9a85fb7c745f..1f0949163019 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -174,7 +174,7 @@ public ApiResponse> getInventoryWithHttpInfo() throws ApiEx
   }
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    * @param orderId ID of pet that needs to be fetched (required)
    * @return Order
    * @throws ApiException if fails to make API call
@@ -192,7 +192,7 @@ public Order getOrderById(Long orderId) throws ApiException {
 
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    * @param orderId ID of pet that needs to be fetched (required)
    * @return ApiResponse<Order>
    * @throws ApiException if fails to make API call
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/test/java/org/openapitools/client/api/StoreApiTest.java
index 97fed8776ae9..49e5d0ddbb13 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -63,7 +63,7 @@ public void getInventoryTest() throws ApiException {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @throws ApiException if the Api call fails
      */
diff --git a/samples/client/petstore/java/jersey2-java8/api/openapi.yaml b/samples/client/petstore/java/jersey2-java8/api/openapi.yaml
index 5f55e8c53f47..e7e17402f6fd 100644
--- a/samples/client/petstore/java/jersey2-java8/api/openapi.yaml
+++ b/samples/client/petstore/java/jersey2-java8/api/openapi.yaml
@@ -370,7 +370,7 @@ paths:
       x-accepts: application/json
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -672,7 +672,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/client/petstore/java/jersey2-java8/docs/FakeApi.md b/samples/client/petstore/java/jersey2-java8/docs/FakeApi.md
index f0c93223e4ad..84167f65462a 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/FakeApi.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/FakeApi.md
@@ -800,7 +800,7 @@ No authorization required
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 
 ## testInlineAdditionalProperties
diff --git a/samples/client/petstore/java/jersey2-java8/docs/StoreApi.md b/samples/client/petstore/java/jersey2-java8/docs/StoreApi.md
index 7e88578e3c5b..e0b1be10cdf4 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/StoreApi.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/StoreApi.md
@@ -150,7 +150,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java
index a7709eb02847..0c31d3c2d149 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -925,7 +925,7 @@ public APItestGroupParametersRequest int64Group(Long int64Group) {
      * @http.response.details
        
-         
+         

          
 Status Code  Description  Response Headers 
 400  Someting wrong   -  
 400  Something wrong   -  

        

      
      */
@@ -941,7 +941,7 @@ public void execute() throws ApiException {
      * @http.response.details
        
-         
+         

          
 Status Code  Description  Response Headers 
 400  Someting wrong   -  
 400  Something wrong   -  

        

 
      */
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/StoreApi.java
index 9a85fb7c745f..1f0949163019 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -174,7 +174,7 @@ public ApiResponse> getInventoryWithHttpInfo() throws ApiEx
   }
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    * @param orderId ID of pet that needs to be fetched (required)
    * @return Order
    * @throws ApiException if fails to make API call
@@ -192,7 +192,7 @@ public Order getOrderById(Long orderId) throws ApiException {
 
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    * @param orderId ID of pet that needs to be fetched (required)
    * @return ApiResponse<Order>
    * @throws ApiException if fails to make API call
diff --git a/samples/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/api/StoreApiTest.java
index 768b5e53f3c0..db5d1415a4e7 100644
--- a/samples/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -64,7 +64,7 @@ public void getInventoryTest() throws ApiException {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @throws ApiException
      *          if the Api call fails
diff --git a/samples/client/petstore/java/jersey3/api/openapi.yaml b/samples/client/petstore/java/jersey3/api/openapi.yaml
index bd4e3fa22b6c..3e2a497d7a8d 100644
--- a/samples/client/petstore/java/jersey3/api/openapi.yaml
+++ b/samples/client/petstore/java/jersey3/api/openapi.yaml
@@ -386,7 +386,7 @@ paths:
       x-accepts: application/json
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -686,7 +686,7 @@ paths:
         style: form
       responses:
         "400":
-          description: Someting wrong
+          description: Something wrong
       security:
       - bearer_test: []
       summary: Fake endpoint to test group parameters (optional)
diff --git a/samples/client/petstore/java/jersey3/docs/FakeApi.md b/samples/client/petstore/java/jersey3/docs/FakeApi.md
index 00365edeae97..0663bb791e4f 100644
--- a/samples/client/petstore/java/jersey3/docs/FakeApi.md
+++ b/samples/client/petstore/java/jersey3/docs/FakeApi.md
@@ -861,7 +861,7 @@ null (empty response body)
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 
 ## testInlineAdditionalProperties
diff --git a/samples/client/petstore/java/jersey3/docs/StoreApi.md b/samples/client/petstore/java/jersey3/docs/StoreApi.md
index a3cbc7ec0507..6eab555ee029 100644
--- a/samples/client/petstore/java/jersey3/docs/StoreApi.md
+++ b/samples/client/petstore/java/jersey3/docs/StoreApi.md
@@ -150,7 +150,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/FakeApi.java
index 9f2482642dfa..84549ce06098 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -982,7 +982,7 @@ public APItestGroupParametersRequest int64Group(Long int64Group) {
      * @http.response.details
        
-         
+         

          
 Status Code  Description  Response Headers 
 400  Someting wrong   -  
 400  Something wrong   -  

        

      
      */
@@ -998,7 +998,7 @@ public void execute() throws ApiException {
      * @http.response.details
        
-         
+         

          
 Status Code  Description  Response Headers 
 400  Someting wrong   -  
 400  Something wrong   -  

        

 
      */
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/StoreApi.java
index 0f4dd5cf858a..bee4f7e72bf9 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -174,7 +174,7 @@ public ApiResponse> getInventoryWithHttpInfo() throws ApiEx
   }
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    * @param orderId ID of pet that needs to be fetched (required)
    * @return Order
    * @throws ApiException if fails to make API call
@@ -192,7 +192,7 @@ public Order getOrderById(Long orderId) throws ApiException {
 
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    * @param orderId ID of pet that needs to be fetched (required)
    * @return ApiResponse<Order>
    * @throws ApiException if fails to make API call
diff --git a/samples/client/petstore/java/jersey3/src/test/java/org/openapitools/client/JSONComposedSchemaTest.java b/samples/client/petstore/java/jersey3/src/test/java/org/openapitools/client/JSONComposedSchemaTest.java
index 1834c34b0685..7b580659538c 100644
--- a/samples/client/petstore/java/jersey3/src/test/java/org/openapitools/client/JSONComposedSchemaTest.java
+++ b/samples/client/petstore/java/jersey3/src/test/java/org/openapitools/client/JSONComposedSchemaTest.java
@@ -90,7 +90,7 @@ public void testCastException() throws Exception {
             assertTrue(o.getActualInstance() instanceof AppleReq);
             BananaReq inst2 = o.getBananaReq(); // should throw ClassCastException
         });
-        // comment out below as the erorr message can be different due to JDK versions
+        // comment out below as the error message can be different due to JDK versions
         // org.opentest4j.AssertionFailedError: expected:  but was: 
         //Assertions.assertEquals("class org.openapitools.client.model.AppleReq cannot be cast to class org.openapitools.client.model.BananaReq (org.openapitools.client.model.AppleReq and org.openapitools.client.model.BananaReq are in unnamed module of loader 'app')", thrown.getMessage());
        Assertions.assertNotNull(thrown);
@@ -141,7 +141,7 @@ public void testOneOfSchemaWithoutDiscriminator() throws Exception {
             });
             assertTrue(exception.getMessage().contains("Failed deserialization for FruitReq: 2 classes match result"));
             // TODO: add a similar unit test where the oneOf child schemas have required properties.
-            // If the implementation is correct, the unmarshaling should take the "required" keyword
+            // If the implementation is correct, the unmarshalling should take the "required" keyword
             // into consideration, which it is not doing currently.
         }
         {
@@ -232,7 +232,7 @@ public void testOneOfNullable() throws Exception {
     @Test
     public void testOneOfMultipleDiscriminators() throws Exception {
         // 'shapeType' is a discriminator for the 'Shape' model and
-        // 'triangleType' is a discriminator forr the 'Triangle' model.
+        // 'triangleType' is a discriminator for the 'Triangle' model.
         String str = "{ \"shapeType\": \"Triangle\", \"triangleType\": \"EquilateralTriangle\" }";
 
         // We should be able to deserialize a equilateral triangle into a EquilateralTriangle class.
diff --git a/samples/client/petstore/java/jersey3/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/jersey3/src/test/java/org/openapitools/client/api/StoreApiTest.java
index 38f008c16cdb..f609a3701644 100644
--- a/samples/client/petstore/java/jersey3/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/jersey3/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -63,7 +63,7 @@ public void getInventoryTest() throws ApiException {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @throws ApiException if the Api call fails
      */
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/docs/StoreApi.md b/samples/client/petstore/java/microprofile-rest-client-3.0/docs/StoreApi.md
index 08e810fdab2c..ae64b8574e22 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/docs/StoreApi.md
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/docs/StoreApi.md
@@ -153,7 +153,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/StoreApi.java
index ea8a22c76734..065c9dbfe463 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -64,7 +64,7 @@ public interface StoreApi  {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      */
     @GET
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/test/java/org/openapitools/client/api/StoreApiTest.java
index 4e7e884ae2a9..712d7da2c166 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -84,7 +84,7 @@ public void getInventoryTest() {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @throws ApiException
      *          if the Api call fails
diff --git a/samples/client/petstore/java/microprofile-rest-client/docs/StoreApi.md b/samples/client/petstore/java/microprofile-rest-client/docs/StoreApi.md
index 8f599b0364fb..4d90de84607a 100644
--- a/samples/client/petstore/java/microprofile-rest-client/docs/StoreApi.md
+++ b/samples/client/petstore/java/microprofile-rest-client/docs/StoreApi.md
@@ -153,7 +153,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/StoreApi.java
index 93b22832c682..7b4d9b5ee681 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -64,7 +64,7 @@ public interface StoreApi  {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      */
     @GET
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/microprofile-rest-client/src/test/java/org/openapitools/client/api/StoreApiTest.java
index 73d983d814a2..ca77aa2845c1 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -98,7 +98,7 @@ public void getInventoryTest() {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @throws ApiException
      *          if the Api call fails
diff --git a/samples/client/petstore/java/native-async/api/openapi.yaml b/samples/client/petstore/java/native-async/api/openapi.yaml
index 5f55e8c53f47..e7e17402f6fd 100644
--- a/samples/client/petstore/java/native-async/api/openapi.yaml
+++ b/samples/client/petstore/java/native-async/api/openapi.yaml
@@ -370,7 +370,7 @@ paths:
       x-accepts: application/json
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -672,7 +672,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/client/petstore/java/native-async/docs/FakeApi.md b/samples/client/petstore/java/native-async/docs/FakeApi.md
index 3ecae4a48cc0..a73552ed930f 100644
--- a/samples/client/petstore/java/native-async/docs/FakeApi.md
+++ b/samples/client/petstore/java/native-async/docs/FakeApi.md
@@ -1627,7 +1627,7 @@ No authorization required
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 ## testGroupParametersWithHttpInfo
 
@@ -1715,7 +1715,7 @@ No authorization required
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 
 
diff --git a/samples/client/petstore/java/native-async/docs/StoreApi.md b/samples/client/petstore/java/native-async/docs/StoreApi.md
index 3042949fd609..13a27f70bdf5 100644
--- a/samples/client/petstore/java/native-async/docs/StoreApi.md
+++ b/samples/client/petstore/java/native-async/docs/StoreApi.md
@@ -313,7 +313,7 @@ CompletableFuture>
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
@@ -381,7 +381,7 @@ No authorization required
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/StoreApi.java
index 74fa9c254e96..8a4ab19b2071 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -239,7 +239,7 @@ private HttpRequest.Builder getInventoryRequestBuilder() throws ApiException {
   }
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    * @param orderId ID of pet that needs to be fetched (required)
    * @return CompletableFuture<Order>
    * @throws ApiException if fails to make API call
@@ -269,7 +269,7 @@ public CompletableFuture getOrderById(Long orderId) throws ApiException {
 
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    * @param orderId ID of pet that needs to be fetched (required)
    * @return CompletableFuture<ApiResponse<Order>>
    * @throws ApiException if fails to make API call
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index ae24bce91040..698b5bb31e6e 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -80,7 +80,7 @@ public void setName(String name) {
    * Set the additional (undeclared) property with the specified name and value.
    * If the property does not already exist, create it otherwise replace it.
    * @param key the name of the property
-   * @param value the value value of the property
+   * @param value the value of the property
    * @return self reference
    */
   @JsonAnySetter
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index 6e95eda0b135..5a3625f25067 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -81,7 +81,7 @@ public void setName(String name) {
    * Set the additional (undeclared) property with the specified name and value.
    * If the property does not already exist, create it otherwise replace it.
    * @param key the name of the property
-   * @param value the value value of the property
+   * @param value the value of the property
    * @return self reference
    */
   @JsonAnySetter
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 8361af60fe06..72638f3e4839 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -80,7 +80,7 @@ public void setName(String name) {
    * Set the additional (undeclared) property with the specified name and value.
    * If the property does not already exist, create it otherwise replace it.
    * @param key the name of the property
-   * @param value the value value of the property
+   * @param value the value of the property
    * @return self reference
    */
   @JsonAnySetter
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 5d02bc15ae32..42c9d36e7421 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -80,7 +80,7 @@ public void setName(String name) {
    * Set the additional (undeclared) property with the specified name and value.
    * If the property does not already exist, create it otherwise replace it.
    * @param key the name of the property
-   * @param value the value value of the property
+   * @param value the value of the property
    * @return self reference
    */
   @JsonAnySetter
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 62762b535677..337f6634520b 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -81,7 +81,7 @@ public void setName(String name) {
    * Set the additional (undeclared) property with the specified name and value.
    * If the property does not already exist, create it otherwise replace it.
    * @param key the name of the property
-   * @param value the value value of the property
+   * @param value the value of the property
    * @return self reference
    */
   @JsonAnySetter
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index f8bac3d1c2e0..fece9479eafe 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -80,7 +80,7 @@ public void setName(String name) {
    * Set the additional (undeclared) property with the specified name and value.
    * If the property does not already exist, create it otherwise replace it.
    * @param key the name of the property
-   * @param value the value value of the property
+   * @param value the value of the property
    * @return self reference
    */
   @JsonAnySetter
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index 692d474c91f1..5be6aabb7d2b 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -80,7 +80,7 @@ public void setName(String name) {
    * Set the additional (undeclared) property with the specified name and value.
    * If the property does not already exist, create it otherwise replace it.
    * @param key the name of the property
-   * @param value the value value of the property
+   * @param value the value of the property
    * @return self reference
    */
   @JsonAnySetter
diff --git a/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/api/StoreApiTest.java
index 67bdd914ac3b..a130cb587f81 100644
--- a/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/native-async/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -70,7 +70,7 @@ public void getInventoryTest() throws ApiException {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @throws ApiException
      *          if the Api call fails
diff --git a/samples/client/petstore/java/native/api/openapi.yaml b/samples/client/petstore/java/native/api/openapi.yaml
index 5f55e8c53f47..e7e17402f6fd 100644
--- a/samples/client/petstore/java/native/api/openapi.yaml
+++ b/samples/client/petstore/java/native/api/openapi.yaml
@@ -370,7 +370,7 @@ paths:
       x-accepts: application/json
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -672,7 +672,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/client/petstore/java/native/docs/FakeApi.md b/samples/client/petstore/java/native/docs/FakeApi.md
index 7a35dbf48d2b..c6c947207f39 100644
--- a/samples/client/petstore/java/native/docs/FakeApi.md
+++ b/samples/client/petstore/java/native/docs/FakeApi.md
@@ -1536,7 +1536,7 @@ No authorization required
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 ## testGroupParametersWithHttpInfo
 
@@ -1616,7 +1616,7 @@ No authorization required
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 
 
diff --git a/samples/client/petstore/java/native/docs/StoreApi.md b/samples/client/petstore/java/native/docs/StoreApi.md
index 7f2744f1c1a4..f45d5a4c765e 100644
--- a/samples/client/petstore/java/native/docs/StoreApi.md
+++ b/samples/client/petstore/java/native/docs/StoreApi.md
@@ -295,7 +295,7 @@ ApiResponse<**Map<String, Integer>**>
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
@@ -362,7 +362,7 @@ No authorization required
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java
index 682a815d0415..75fca36444d3 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -218,7 +218,7 @@ private HttpRequest.Builder getInventoryRequestBuilder() throws ApiException {
   }
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    * @param orderId ID of pet that needs to be fetched (required)
    * @return Order
    * @throws ApiException if fails to make API call
@@ -230,7 +230,7 @@ public Order getOrderById(Long orderId) throws ApiException {
 
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    * @param orderId ID of pet that needs to be fetched (required)
    * @return ApiResponse<Order>
    * @throws ApiException if fails to make API call
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index ae24bce91040..698b5bb31e6e 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -80,7 +80,7 @@ public void setName(String name) {
    * Set the additional (undeclared) property with the specified name and value.
    * If the property does not already exist, create it otherwise replace it.
    * @param key the name of the property
-   * @param value the value value of the property
+   * @param value the value of the property
    * @return self reference
    */
   @JsonAnySetter
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index 6e95eda0b135..5a3625f25067 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -81,7 +81,7 @@ public void setName(String name) {
    * Set the additional (undeclared) property with the specified name and value.
    * If the property does not already exist, create it otherwise replace it.
    * @param key the name of the property
-   * @param value the value value of the property
+   * @param value the value of the property
    * @return self reference
    */
   @JsonAnySetter
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 8361af60fe06..72638f3e4839 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -80,7 +80,7 @@ public void setName(String name) {
    * Set the additional (undeclared) property with the specified name and value.
    * If the property does not already exist, create it otherwise replace it.
    * @param key the name of the property
-   * @param value the value value of the property
+   * @param value the value of the property
    * @return self reference
    */
   @JsonAnySetter
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 5d02bc15ae32..42c9d36e7421 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -80,7 +80,7 @@ public void setName(String name) {
    * Set the additional (undeclared) property with the specified name and value.
    * If the property does not already exist, create it otherwise replace it.
    * @param key the name of the property
-   * @param value the value value of the property
+   * @param value the value of the property
    * @return self reference
    */
   @JsonAnySetter
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 62762b535677..337f6634520b 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -81,7 +81,7 @@ public void setName(String name) {
    * Set the additional (undeclared) property with the specified name and value.
    * If the property does not already exist, create it otherwise replace it.
    * @param key the name of the property
-   * @param value the value value of the property
+   * @param value the value of the property
    * @return self reference
    */
   @JsonAnySetter
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index f8bac3d1c2e0..fece9479eafe 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -80,7 +80,7 @@ public void setName(String name) {
    * Set the additional (undeclared) property with the specified name and value.
    * If the property does not already exist, create it otherwise replace it.
    * @param key the name of the property
-   * @param value the value value of the property
+   * @param value the value of the property
    * @return self reference
    */
   @JsonAnySetter
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index 692d474c91f1..5be6aabb7d2b 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -80,7 +80,7 @@ public void setName(String name) {
    * Set the additional (undeclared) property with the specified name and value.
    * If the property does not already exist, create it otherwise replace it.
    * @param key the name of the property
-   * @param value the value value of the property
+   * @param value the value of the property
    * @return self reference
    */
   @JsonAnySetter
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/StoreApiTest.java
index 06b18c88b211..6ca7297142c0 100644
--- a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -69,7 +69,7 @@ public void getInventoryTest() throws ApiException {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @throws ApiException
      *          if the Api call fails
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/FakeApi.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/FakeApi.md
index f804c0e19404..49cd429ccb4a 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/FakeApi.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/FakeApi.md
@@ -756,7 +756,7 @@ No authorization required
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 
 # **testInlineAdditionalProperties**
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/StoreApi.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/StoreApi.md
index 76bdde9e995e..962c32a60d37 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/StoreApi.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/StoreApi.md
@@ -143,7 +143,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```java
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/api/FakeApi.java
index 36dc208a26c4..edea781fa985 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -1671,7 +1671,7 @@ public APItestGroupParametersRequest int64Group(Long int64Group) {
          * @http.response.details
          
-            
+            

             
 Status Code  Description  Response Headers 
 400  Someting wrong   -  
 400  Something wrong   -  

          

          */
         public okhttp3.Call buildCall(final ApiCallback _callback) throws ApiException {
@@ -1684,7 +1684,7 @@ public okhttp3.Call buildCall(final ApiCallback _callback) throws ApiException {
          * @http.response.details
          
-            
+            

             
 Status Code  Description  Response Headers 
 400  Someting wrong   -  
 400  Something wrong   -  

          

          */
         public void execute() throws ApiException {
@@ -1698,7 +1698,7 @@ public void execute() throws ApiException {
          * @http.response.details
          
-            
+            

             
 Status Code  Description  Response Headers 
 400  Someting wrong   -  
 400  Something wrong   -  

          

          */
         public ApiResponse executeWithHttpInfo() throws ApiException {
@@ -1713,7 +1713,7 @@ public ApiResponse executeWithHttpInfo() throws ApiException {
          * @http.response.details
          
-            
+            

             
 Status Code  Description  Response Headers 
 400  Someting wrong   -  
 400  Something wrong   -  

          

          */
         public okhttp3.Call executeAsync(final ApiCallback _callback) throws ApiException {
@@ -1731,7 +1731,7 @@ public okhttp3.Call executeAsync(final ApiCallback _callback) throws ApiEx
      * @http.response.details
      
-        
+        

         
 Status Code  Description  Response Headers 
 400  Someting wrong   -  
 400  Something wrong   -  

      

      */
     public APItestGroupParametersRequest testGroupParameters(Integer requiredStringGroup, Boolean requiredBooleanGroup, Long requiredInt64Group) {
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/api/StoreApi.java
index e329b7008062..1a173c40ca76 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -408,7 +408,7 @@ private okhttp3.Call getOrderByIdValidateBeforeCall(Long orderId, final ApiCallb
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched (required)
      * @return Order
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
@@ -427,7 +427,7 @@ public Order getOrderById(Long orderId) throws ApiException {
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched (required)
      * @return ApiResponse<Order>
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
@@ -447,7 +447,7 @@ public ApiResponse getOrderByIdWithHttpInfo(Long orderId) throws ApiExcep
 
     /**
      * Find purchase order by ID (asynchronously)
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched (required)
      * @param _callback The callback to be executed when the API call finishes
      * @return The request call
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/resources/openapi/openapi.yaml b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/resources/openapi/openapi.yaml
index 5f55e8c53f47..e7e17402f6fd 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/resources/openapi/openapi.yaml
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/resources/openapi/openapi.yaml
@@ -370,7 +370,7 @@ paths:
       x-accepts: application/json
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -672,7 +672,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/test/java/org/openapitools/client/JSONTest.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/test/java/org/openapitools/client/JSONTest.java
index 4fdb824f6b15..192c7e2b132d 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/test/java/org/openapitools/client/JSONTest.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/test/java/org/openapitools/client/JSONTest.java
@@ -94,7 +94,7 @@ public void testDateTypeAdapter() {
             // OK
         }
         try {
-            // unexpected miliseconds
+            // unexpected milliseconds
             json.deserialize("\"2015-11-07T03:49:09.000Z\"", Date.class);
             fail("json parsing should fail");
         } catch (RuntimeException e) {
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/test/java/org/openapitools/client/api/StoreApiTest.java
index 786a51c7d142..b6d81a6c5800 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -61,7 +61,7 @@ public void getInventoryTest() throws ApiException {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @throws ApiException if the Api call fails
      */
diff --git a/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Category.java
index 8f02b16a9d08..74e474b0e27a 100644
--- a/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Category.java
@@ -236,7 +236,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, Category value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index e1ac93794509..855c8732c421 100644
--- a/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -268,7 +268,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, ModelApiResponse value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Order.java
index cd1d2e950f23..b6069802987b 100644
--- a/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Order.java
@@ -402,7 +402,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, Order value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Pet.java
index f7ee418ae9e2..e82a8626bb0d 100644
--- a/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Pet.java
@@ -456,7 +456,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, Pet value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Tag.java
index b010e1ce9c61..312895d569ff 100644
--- a/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Tag.java
@@ -236,7 +236,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, Tag value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/User.java
index 267f33a37083..3078490c3af5 100644
--- a/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/User.java
@@ -425,7 +425,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, User value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/api/openapi.yaml b/samples/client/petstore/java/okhttp-gson-parcelableModel/api/openapi.yaml
index 5f55e8c53f47..e7e17402f6fd 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/api/openapi.yaml
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/api/openapi.yaml
@@ -370,7 +370,7 @@ paths:
       x-accepts: application/json
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -672,7 +672,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FakeApi.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FakeApi.md
index f804c0e19404..49cd429ccb4a 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FakeApi.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FakeApi.md
@@ -756,7 +756,7 @@ No authorization required
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 
 # **testInlineAdditionalProperties**
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/StoreApi.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/StoreApi.md
index 76bdde9e995e..962c32a60d37 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/StoreApi.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/StoreApi.md
@@ -143,7 +143,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```java
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeApi.java
index 6dfe38809b7e..8e914fae8b41 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -1619,7 +1619,7 @@ public APItestGroupParametersRequest int64Group(Long int64Group) {
          * @http.response.details
          
-            
+            

             
 Status Code  Description  Response Headers 
 400  Someting wrong   -  
 400  Something wrong   -  

          

          */
         public okhttp3.Call buildCall(final ApiCallback _callback) throws ApiException {
@@ -1632,7 +1632,7 @@ public okhttp3.Call buildCall(final ApiCallback _callback) throws ApiException {
          * @http.response.details
          
-            
+            

             
 Status Code  Description  Response Headers 
 400  Someting wrong   -  
 400  Something wrong   -  

          

          */
         public void execute() throws ApiException {
@@ -1646,7 +1646,7 @@ public void execute() throws ApiException {
          * @http.response.details
          
-            
+            

             
 Status Code  Description  Response Headers 
 400  Someting wrong   -  
 400  Something wrong   -  

          

          */
         public ApiResponse executeWithHttpInfo() throws ApiException {
@@ -1661,7 +1661,7 @@ public ApiResponse executeWithHttpInfo() throws ApiException {
          * @http.response.details
          
-            
+            

             
 Status Code  Description  Response Headers 
 400  Someting wrong   -  
 400  Something wrong   -  

          

          */
         public okhttp3.Call executeAsync(final ApiCallback _callback) throws ApiException {
@@ -1679,7 +1679,7 @@ public okhttp3.Call executeAsync(final ApiCallback _callback) throws ApiEx
      * @http.response.details
      
-        
+        

         
 Status Code  Description  Response Headers 
 400  Someting wrong   -  
 400  Something wrong   -  

      

      */
     public APItestGroupParametersRequest testGroupParameters(Integer requiredStringGroup, Boolean requiredBooleanGroup, Long requiredInt64Group) {
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/StoreApi.java
index ac429922b6d4..064e82874b02 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -381,7 +381,7 @@ private okhttp3.Call getOrderByIdValidateBeforeCall(Long orderId, final ApiCallb
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched (required)
      * @return Order
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
@@ -400,7 +400,7 @@ public Order getOrderById(Long orderId) throws ApiException {
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched (required)
      * @return ApiResponse<Order>
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
@@ -420,7 +420,7 @@ public ApiResponse getOrderByIdWithHttpInfo(Long orderId) throws ApiExcep
 
     /**
      * Find purchase order by ID (asynchronously)
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched (required)
      * @param _callback The callback to be executed when the API call finishes
      * @return The request call
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/test/java/org/openapitools/client/api/StoreApiTest.java
index 4aa80d6f0a39..856dc21442c8 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -66,7 +66,7 @@ public void getInventoryTest() throws ApiException {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @throws ApiException
      *          if the Api call fails
diff --git a/samples/client/petstore/java/okhttp-gson-swagger1/api/openapi.yaml b/samples/client/petstore/java/okhttp-gson-swagger1/api/openapi.yaml
index 2d7ea625b483..de4b48c1c439 100644
--- a/samples/client/petstore/java/okhttp-gson-swagger1/api/openapi.yaml
+++ b/samples/client/petstore/java/okhttp-gson-swagger1/api/openapi.yaml
@@ -364,7 +364,7 @@ paths:
       x-accepts: application/json
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
diff --git a/samples/client/petstore/java/okhttp-gson-swagger1/docs/StoreApi.md b/samples/client/petstore/java/okhttp-gson-swagger1/docs/StoreApi.md
index 75649777141e..2cd1833e6b91 100644
--- a/samples/client/petstore/java/okhttp-gson-swagger1/docs/StoreApi.md
+++ b/samples/client/petstore/java/okhttp-gson-swagger1/docs/StoreApi.md
@@ -143,7 +143,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```java
diff --git a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/api/StoreApi.java
index 703d4f926b5f..324f35d5166e 100644
--- a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -381,7 +381,7 @@ private okhttp3.Call getOrderByIdValidateBeforeCall(Long orderId, final ApiCallb
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched (required)
      * @return Order
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
@@ -400,7 +400,7 @@ public Order getOrderById(Long orderId) throws ApiException {
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched (required)
      * @return ApiResponse<Order>
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
@@ -420,7 +420,7 @@ public ApiResponse getOrderByIdWithHttpInfo(Long orderId) throws ApiExcep
 
     /**
      * Find purchase order by ID (asynchronously)
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched (required)
      * @param _callback The callback to be executed when the API call finishes
      * @return The request call
diff --git a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Category.java
index f1c2ab035881..d404c0c07ca6 100644
--- a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Category.java
@@ -241,7 +241,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, Category value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 1eddb844b190..db10be182961 100644
--- a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -274,7 +274,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, ModelApiResponse value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Order.java
index a88514fafee6..547ed754b820 100644
--- a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Order.java
@@ -411,7 +411,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, Order value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Pet.java
index 13f03b976f50..7e20756fb079 100644
--- a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Pet.java
@@ -465,7 +465,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, Pet value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Tag.java
index 29cf8fe79a15..d6e095358fa4 100644
--- a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Tag.java
@@ -241,7 +241,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, Tag value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/User.java
index 726c838cf32d..3dc3fc06dfa0 100644
--- a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/User.java
@@ -436,7 +436,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, User value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson-swagger1/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/okhttp-gson-swagger1/src/test/java/org/openapitools/client/api/StoreApiTest.java
index d8f7e07e96d7..3ca20d0b210b 100644
--- a/samples/client/petstore/java/okhttp-gson-swagger1/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/okhttp-gson-swagger1/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -61,7 +61,7 @@ public void getInventoryTest() throws ApiException {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @throws ApiException if the Api call fails
      */
diff --git a/samples/client/petstore/java/okhttp-gson/api/openapi.yaml b/samples/client/petstore/java/okhttp-gson/api/openapi.yaml
index 1ad553c3adca..c14ba32722ff 100644
--- a/samples/client/petstore/java/okhttp-gson/api/openapi.yaml
+++ b/samples/client/petstore/java/okhttp-gson/api/openapi.yaml
@@ -386,7 +386,7 @@ paths:
       x-accepts: application/json
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -686,7 +686,7 @@ paths:
         style: form
       responses:
         "400":
-          description: Someting wrong
+          description: Something wrong
       security:
       - bearer_test: []
       summary: Fake endpoint to test group parameters (optional)
diff --git a/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md b/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md
index 2b7eebac9564..e004c39d3165 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md
@@ -813,7 +813,7 @@ null (empty response body)
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 
 # **testInlineAdditionalProperties**
diff --git a/samples/client/petstore/java/okhttp-gson/docs/StoreApi.md b/samples/client/petstore/java/okhttp-gson/docs/StoreApi.md
index 26866a89c1ac..59b4051d1a05 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/StoreApi.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/StoreApi.md
@@ -143,7 +143,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```java
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java
index 99ad929095d9..48c569065c51 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -1727,7 +1727,7 @@ public APItestGroupParametersRequest int64Group(Long int64Group) {
          * @http.response.details
          
-            
+            

             
 Status Code  Description  Response Headers 
 400  Someting wrong   -  
 400  Something wrong   -  

          

          */
         public okhttp3.Call buildCall(final ApiCallback _callback) throws ApiException {
@@ -1740,7 +1740,7 @@ public okhttp3.Call buildCall(final ApiCallback _callback) throws ApiException {
          * @http.response.details
          
-            
+            

             
 Status Code  Description  Response Headers 
 400  Someting wrong   -  
 400  Something wrong   -  

          

          */
         public void execute() throws ApiException {
@@ -1754,7 +1754,7 @@ public void execute() throws ApiException {
          * @http.response.details
          
-            
+            

             
 Status Code  Description  Response Headers 
 400  Someting wrong   -  
 400  Something wrong   -  

          

          */
         public ApiResponse executeWithHttpInfo() throws ApiException {
@@ -1769,7 +1769,7 @@ public ApiResponse executeWithHttpInfo() throws ApiException {
          * @http.response.details
          
-            
+            

             
 Status Code  Description  Response Headers 
 400  Someting wrong   -  
 400  Something wrong   -  

          

          */
         public okhttp3.Call executeAsync(final ApiCallback _callback) throws ApiException {
@@ -1787,7 +1787,7 @@ public okhttp3.Call executeAsync(final ApiCallback _callback) throws ApiEx
      * @http.response.details
      
-        
+        

         
 Status Code  Description  Response Headers 
 400  Someting wrong   -  
 400  Something wrong   -  

      

      */
     public APItestGroupParametersRequest testGroupParameters(Integer requiredStringGroup, Boolean requiredBooleanGroup, Long requiredInt64Group) {
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/StoreApi.java
index 6069ecfb8c5f..82f6c6b979ae 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -381,7 +381,7 @@ private okhttp3.Call getOrderByIdValidateBeforeCall(Long orderId, final ApiCallb
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched (required)
      * @return Order
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
@@ -400,7 +400,7 @@ public Order getOrderById(Long orderId) throws ApiException {
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched (required)
      * @return ApiResponse<Order>
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
@@ -420,7 +420,7 @@ public ApiResponse getOrderByIdWithHttpInfo(Long orderId) throws ApiExcep
 
     /**
      * Find purchase order by ID (asynchronously)
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched (required)
      * @param _callback The callback to be executed when the API call finishes
      * @return The request call
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 28bbb53b248e..80b994c0a727 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -453,7 +453,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, AdditionalPropertiesClass value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Apple.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Apple.java
index 8403f7bc7861..86449232ba93 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Apple.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Apple.java
@@ -239,7 +239,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, Apple value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 328f87fed425..d8b8520638d3 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -219,7 +219,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, ArrayOfArrayOfNumberOnly value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfInlineAllOf.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfInlineAllOf.java
index d4a97afe3574..8d4287ee23f5 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfInlineAllOf.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfInlineAllOf.java
@@ -298,7 +298,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, ArrayOfInlineAllOf value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfInlineAllOfArrayAllofDogPropertyInner.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfInlineAllOfArrayAllofDogPropertyInner.java
index fd3e87183708..1e067f7667c0 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfInlineAllOfArrayAllofDogPropertyInner.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfInlineAllOfArrayAllofDogPropertyInner.java
@@ -239,7 +239,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, ArrayOfInlineAllOfArrayAllofDogPropertyInner value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf.java
index b82117442953..8b3de5de2237 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf.java
@@ -207,7 +207,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1.java
index 77b489973255..8a96f016aad4 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1.java
@@ -207,7 +207,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1 value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 62f4627a3aba..8a2d52324787 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -219,7 +219,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, ArrayOfNumberOnly value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayTest.java
index 61a26ef0868a..8bbfae30736b 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -301,7 +301,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, ArrayTest value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Banana.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Banana.java
index eb2181214288..20c20d580222 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Banana.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Banana.java
@@ -205,7 +205,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, Banana value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/BasquePig.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/BasquePig.java
index b27c3c4ad595..d0fb1e9d263a 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/BasquePig.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/BasquePig.java
@@ -215,7 +215,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, BasquePig value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Capitalization.java
index e075e5213476..4336894f3172 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -367,7 +367,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, Capitalization value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Cat.java
index 71f5f179e66e..5d870dc417c7 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Cat.java
@@ -218,7 +218,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, Cat value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/CatAllOf.java
index f85e8ee16fc5..1d5e106c0942 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -204,7 +204,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, CatAllOf value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Category.java
index 80930ee7ae02..c5808b89ae4e 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Category.java
@@ -244,7 +244,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, Category value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ClassModel.java
index 3389bd118076..6d367ffa429b 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -207,7 +207,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, ClassModel value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Client.java
index 13228390a8fb..321fd1df16df 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Client.java
@@ -207,7 +207,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, Client value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java
index aef8ae5e7d6a..e4c4c69e0b9a 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java
@@ -248,7 +248,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, ComplexQuadrilateral value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/DanishPig.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/DanishPig.java
index 4f41de3c6942..8241d280a02b 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/DanishPig.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/DanishPig.java
@@ -215,7 +215,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, DanishPig value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/DeprecatedObject.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/DeprecatedObject.java
index 89469f8273f8..b0e05f5dded0 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/DeprecatedObject.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/DeprecatedObject.java
@@ -209,7 +209,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, DeprecatedObject value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Dog.java
index 88118b5b348b..0531422dde69 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Dog.java
@@ -218,7 +218,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, Dog value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/DogAllOf.java
index 94fb4156761e..57b6b6de82ff 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -207,7 +207,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, DogAllOf value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumArrays.java
index 1cf0b6fc4f90..8bf16a25a81a 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -344,7 +344,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, EnumArrays value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumStringDiscriminator.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumStringDiscriminator.java
index a91ba4999359..e321e66158b3 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumStringDiscriminator.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumStringDiscriminator.java
@@ -259,7 +259,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, EnumStringDiscriminator value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java
index c0f032081a7d..df981cff1dda 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -705,7 +705,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, EnumTest value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EquilateralTriangle.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EquilateralTriangle.java
index 6df080b77c2e..7d0557b6fbf6 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EquilateralTriangle.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EquilateralTriangle.java
@@ -248,7 +248,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, EquilateralTriangle value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 70afd7f228c5..2f0f5831b712 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -262,7 +262,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, FileSchemaTestClass value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Foo.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Foo.java
index 18d24ce35236..6591e49b1d96 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Foo.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Foo.java
@@ -207,7 +207,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, Foo value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index b6cf56d6bb57..3398f0f05881 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -209,7 +209,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, FooGetDefaultResponse value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FormatTest.java
index bbf26ee29b03..2e1f63f769dd 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -712,7 +712,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, FormatTest value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index d07eac97c673..30174cbd5ad6 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -231,7 +231,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, HasOnlyReadOnly value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/HealthCheckResult.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/HealthCheckResult.java
index 9518b0b2a3cb..910feb89c13a 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/HealthCheckResult.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/HealthCheckResult.java
@@ -219,7 +219,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, HealthCheckResult value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MapTest.java
index 3d7ef57a005e..642cb06aab0e 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MapTest.java
@@ -372,7 +372,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, MapTest value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index c15891e298d5..bbfdee310991 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -278,7 +278,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, MixedPropertiesAndAdditionalPropertiesClass value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Model200Response.java
index b737dd426657..eaab91cfe928 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -236,7 +236,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, Model200Response value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index ce22205c284c..2a9dbc746ff7 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -268,7 +268,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, ModelApiResponse value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelFile.java
index 6427d62625bb..de3cdd9914ba 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelFile.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelFile.java
@@ -207,7 +207,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, ModelFile value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelList.java
index 8cc4aabfcda6..42ef11b0a32a 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelList.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelList.java
@@ -207,7 +207,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, ModelList value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelReturn.java
index 71d191177f7a..7a3c67d42fc9 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -204,7 +204,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, ModelReturn value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Name.java
index 68fc6ab06814..24997479f9ee 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Name.java
@@ -294,7 +294,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, Name value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NumberOnly.java
index f01af57e0c10..2ed94c6f0a5b 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -205,7 +205,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, NumberOnly value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
index e0f13eef1281..1186d9bd9152 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
@@ -320,7 +320,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, ObjectWithDeprecatedFields value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java
index 01d74430dcac..2000a36004e2 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java
@@ -402,7 +402,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, Order value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterComposite.java
index 05a163161da6..400a51a5155b 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -266,7 +266,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, OuterComposite value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ParentPet.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ParentPet.java
index 51c3ae6fc2ce..ffc645f582df 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ParentPet.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ParentPet.java
@@ -186,7 +186,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, ParentPet value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java
index bfba10cd0b34..a14813e2f38e 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java
@@ -454,7 +454,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, Pet value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetWithRequiredTags.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetWithRequiredTags.java
index fdf330c88ca0..6fc90776b813 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetWithRequiredTags.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetWithRequiredTags.java
@@ -448,7 +448,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, PetWithRequiredTags value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java
index 98f88dea6dbf..6c817c77bf74 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java
@@ -215,7 +215,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, QuadrilateralInterface value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index ffa344cd8919..5dca09f9429e 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -238,7 +238,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, ReadOnlyFirst value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ScaleneTriangle.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ScaleneTriangle.java
index 149f5f59be6d..32cc45abe8a6 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ScaleneTriangle.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ScaleneTriangle.java
@@ -248,7 +248,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, ScaleneTriangle value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ShapeInterface.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ShapeInterface.java
index 6584c3cd601c..cd6bc7052c5a 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ShapeInterface.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ShapeInterface.java
@@ -215,7 +215,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, ShapeInterface value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java
index 9a10cbaab24a..918741f9ce63 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java
@@ -248,7 +248,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, SimpleQuadrilateral value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 289e823eb91d..af54ba6e24e4 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -236,7 +236,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, SpecialModelName value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Tag.java
index 807a6426c4ee..4ee8713b6f17 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Tag.java
@@ -236,7 +236,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, Tag value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/TriangleInterface.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/TriangleInterface.java
index 20ba9fa34137..bc27096a1089 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/TriangleInterface.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/TriangleInterface.java
@@ -215,7 +215,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, TriangleInterface value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/User.java
index 38382f220e86..5a588fe40de1 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/User.java
@@ -553,7 +553,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, User value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Whale.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Whale.java
index 8eb262731381..07af8685223c 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Whale.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Whale.java
@@ -273,7 +273,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, Whale value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Zebra.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Zebra.java
index 3acf608a6fce..12f27a952f6b 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Zebra.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Zebra.java
@@ -296,7 +296,7 @@ public  TypeAdapter create(Gson gson, TypeToken type) {
            public void write(JsonWriter out, Zebra value) throws IOException {
              JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
              obj.remove("additionalProperties");
-             // serialize additonal properties
+             // serialize additional properties
              if (value.getAdditionalProperties() != null) {
                for (Map.Entry entry : value.getAdditionalProperties().entrySet()) {
                  if (entry.getValue() instanceof String)
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/JSONTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/JSONTest.java
index e90fe6a55fc7..8e042e923446 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/JSONTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/JSONTest.java
@@ -113,7 +113,7 @@ public void testDateTypeAdapter() {
             // OK
         }
         try {
-            // unexpected miliseconds
+            // unexpected milliseconds
             json.deserialize("\"2015-11-07T03:49:09.000Z\"", Date.class);
             fail("json parsing should fail");
         } catch (RuntimeException e) {
diff --git a/samples/client/petstore/java/rest-assured-jackson/api/openapi.yaml b/samples/client/petstore/java/rest-assured-jackson/api/openapi.yaml
index 5f55e8c53f47..e7e17402f6fd 100644
--- a/samples/client/petstore/java/rest-assured-jackson/api/openapi.yaml
+++ b/samples/client/petstore/java/rest-assured-jackson/api/openapi.yaml
@@ -370,7 +370,7 @@ paths:
       x-accepts: application/json
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -672,7 +672,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/StoreApi.md b/samples/client/petstore/java/rest-assured-jackson/docs/StoreApi.md
index 5466205059cd..4574efe73c08 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/StoreApi.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/StoreApi.md
@@ -96,7 +96,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```java
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/StoreApi.java
index 2cd3e0d21c59..730db2d87b7a 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -214,7 +214,7 @@ public GetInventoryOper respSpec(Consumer respSpecCustomize
     }
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @see #orderIdPath ID of pet that needs to be fetched (required)
      * return Order
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/api/FakeApiTest.java
index d014aee7cd52..183de79127e1 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/api/FakeApiTest.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/api/FakeApiTest.java
@@ -240,7 +240,7 @@ public void shouldSee404AfterTestEnumParameters() {
 
 
     /**
-     * Someting wrong
+     * Something wrong
      */
     @Test
     public void shouldSee400AfterTestGroupParameters() {
diff --git a/samples/client/petstore/java/rest-assured/api/openapi.yaml b/samples/client/petstore/java/rest-assured/api/openapi.yaml
index 5f55e8c53f47..e7e17402f6fd 100644
--- a/samples/client/petstore/java/rest-assured/api/openapi.yaml
+++ b/samples/client/petstore/java/rest-assured/api/openapi.yaml
@@ -370,7 +370,7 @@ paths:
       x-accepts: application/json
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -672,7 +672,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/client/petstore/java/rest-assured/docs/StoreApi.md b/samples/client/petstore/java/rest-assured/docs/StoreApi.md
index 5466205059cd..4574efe73c08 100644
--- a/samples/client/petstore/java/rest-assured/docs/StoreApi.md
+++ b/samples/client/petstore/java/rest-assured/docs/StoreApi.md
@@ -96,7 +96,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```java
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/StoreApi.java
index 00080fed5a03..fd1abe4db3c5 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -215,7 +215,7 @@ public GetInventoryOper respSpec(Consumer respSpecCustomize
     }
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @see #orderIdPath ID of pet that needs to be fetched (required)
      * return Order
diff --git a/samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/api/FakeApiTest.java
index a6b1698aece0..e248c2155a25 100644
--- a/samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/api/FakeApiTest.java
+++ b/samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/api/FakeApiTest.java
@@ -240,7 +240,7 @@ public void shouldSee404AfterTestEnumParameters() {
 
 
     /**
-     * Someting wrong
+     * Something wrong
      */
     @Test
     public void shouldSee400AfterTestGroupParameters() {
diff --git a/samples/client/petstore/java/resteasy/api/openapi.yaml b/samples/client/petstore/java/resteasy/api/openapi.yaml
index 5f55e8c53f47..e7e17402f6fd 100644
--- a/samples/client/petstore/java/resteasy/api/openapi.yaml
+++ b/samples/client/petstore/java/resteasy/api/openapi.yaml
@@ -370,7 +370,7 @@ paths:
       x-accepts: application/json
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -672,7 +672,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/client/petstore/java/resteasy/docs/FakeApi.md b/samples/client/petstore/java/resteasy/docs/FakeApi.md
index 25301e7502c3..627366e41db3 100644
--- a/samples/client/petstore/java/resteasy/docs/FakeApi.md
+++ b/samples/client/petstore/java/resteasy/docs/FakeApi.md
@@ -796,7 +796,7 @@ No authorization required
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 
 ## testInlineAdditionalProperties
diff --git a/samples/client/petstore/java/resteasy/docs/StoreApi.md b/samples/client/petstore/java/resteasy/docs/StoreApi.md
index 571e808abdfb..b64e208a83a3 100644
--- a/samples/client/petstore/java/resteasy/docs/StoreApi.md
+++ b/samples/client/petstore/java/resteasy/docs/StoreApi.md
@@ -152,7 +152,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/StoreApi.java
index c5cd88a18711..d6e587d24b01 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -116,7 +116,7 @@ public Map getInventory() throws ApiException {
       }
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    * @param orderId ID of pet that needs to be fetched (required)
    * @return a {@code Order}
    * @throws ApiException if fails to make API call
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/api/StoreApiTest.java
index f83e6c38972d..a43d64debf1d 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -66,7 +66,7 @@ public void getInventoryTest() throws ApiException {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @throws ApiException
      *          if the Api call fails
diff --git a/samples/client/petstore/java/resttemplate-swagger1/api/openapi.yaml b/samples/client/petstore/java/resttemplate-swagger1/api/openapi.yaml
index 2d7ea625b483..de4b48c1c439 100644
--- a/samples/client/petstore/java/resttemplate-swagger1/api/openapi.yaml
+++ b/samples/client/petstore/java/resttemplate-swagger1/api/openapi.yaml
@@ -364,7 +364,7 @@ paths:
       x-accepts: application/json
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
diff --git a/samples/client/petstore/java/resttemplate-swagger1/docs/StoreApi.md b/samples/client/petstore/java/resttemplate-swagger1/docs/StoreApi.md
index f401d417df2c..bacbaeef1403 100644
--- a/samples/client/petstore/java/resttemplate-swagger1/docs/StoreApi.md
+++ b/samples/client/petstore/java/resttemplate-swagger1/docs/StoreApi.md
@@ -152,7 +152,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/api/StoreApi.java
index dcb96aad9f15..3172d5ab47e3 100644
--- a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -136,7 +136,7 @@ public ResponseEntity> getInventoryWithHttpInfo() throws Re
     }
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * 
200 - successful operation
      * 
400 - Invalid ID supplied
      * 
404 - Order not found
@@ -150,7 +150,7 @@ public Order getOrderById(Long orderId) throws RestClientException {
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * 
200 - successful operation
      * 
400 - Invalid ID supplied
      * 
404 - Order not found
diff --git a/samples/client/petstore/java/resttemplate-swagger1/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/resttemplate-swagger1/src/test/java/org/openapitools/client/api/StoreApiTest.java
index edef3c80ce22..06f67f67d666 100644
--- a/samples/client/petstore/java/resttemplate-swagger1/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/resttemplate-swagger1/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -67,7 +67,7 @@ public void getInventoryTest() {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @throws ApiException
      *          if the Api call fails
diff --git a/samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml b/samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml
index 5f55e8c53f47..e7e17402f6fd 100644
--- a/samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml
+++ b/samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml
@@ -370,7 +370,7 @@ paths:
       x-accepts: application/json
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -672,7 +672,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/FakeApi.md b/samples/client/petstore/java/resttemplate-withXml/docs/FakeApi.md
index 25301e7502c3..627366e41db3 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/FakeApi.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/FakeApi.md
@@ -796,7 +796,7 @@ No authorization required
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 
 ## testInlineAdditionalProperties
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/StoreApi.md b/samples/client/petstore/java/resttemplate-withXml/docs/StoreApi.md
index 571e808abdfb..b64e208a83a3 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/StoreApi.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/StoreApi.md
@@ -152,7 +152,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java
index 1fcb8328c73c..3251aaa0e152 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -602,7 +602,7 @@ public ResponseEntity testEnumParametersWithHttpInfo(List enumHead
     /**
      * Fake endpoint to test group parameters (optional)
      * Fake endpoint to test group parameters (optional)
-     * 
400 - Someting wrong
+     * 
400 - Something wrong
      * @param requiredStringGroup Required String in group parameters (required)
      * @param requiredBooleanGroup Required Boolean in group parameters (required)
      * @param requiredInt64Group Required Integer in group parameters (required)
@@ -618,7 +618,7 @@ public void testGroupParameters(Integer requiredStringGroup, Boolean requiredBoo
     /**
      * Fake endpoint to test group parameters (optional)
      * Fake endpoint to test group parameters (optional)
-     * 
400 - Someting wrong
+     * 
400 - Something wrong
      * @param requiredStringGroup Required String in group parameters (required)
      * @param requiredBooleanGroup Required Boolean in group parameters (required)
      * @param requiredInt64Group Required Integer in group parameters (required)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/StoreApi.java
index 51afdd6c2d43..b45b41c32fdb 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -136,7 +136,7 @@ public ResponseEntity> getInventoryWithHttpInfo() throws Re
     }
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * 
200 - successful operation
      * 
400 - Invalid ID supplied
      * 
404 - Order not found
@@ -150,7 +150,7 @@ public Order getOrderById(Long orderId) throws RestClientException {
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * 
200 - successful operation
      * 
400 - Invalid ID supplied
      * 
404 - Order not found
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/api/StoreApiTest.java
index b448f30ede31..0e7d086feab6 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -65,7 +65,7 @@ public void getInventoryTest() {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @throws ApiException
      *          if the Api call fails
diff --git a/samples/client/petstore/java/resttemplate/api/openapi.yaml b/samples/client/petstore/java/resttemplate/api/openapi.yaml
index 5f55e8c53f47..e7e17402f6fd 100644
--- a/samples/client/petstore/java/resttemplate/api/openapi.yaml
+++ b/samples/client/petstore/java/resttemplate/api/openapi.yaml
@@ -370,7 +370,7 @@ paths:
       x-accepts: application/json
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -672,7 +672,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/client/petstore/java/resttemplate/docs/FakeApi.md b/samples/client/petstore/java/resttemplate/docs/FakeApi.md
index 25301e7502c3..627366e41db3 100644
--- a/samples/client/petstore/java/resttemplate/docs/FakeApi.md
+++ b/samples/client/petstore/java/resttemplate/docs/FakeApi.md
@@ -796,7 +796,7 @@ No authorization required
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 
 ## testInlineAdditionalProperties
diff --git a/samples/client/petstore/java/resttemplate/docs/StoreApi.md b/samples/client/petstore/java/resttemplate/docs/StoreApi.md
index 571e808abdfb..b64e208a83a3 100644
--- a/samples/client/petstore/java/resttemplate/docs/StoreApi.md
+++ b/samples/client/petstore/java/resttemplate/docs/StoreApi.md
@@ -152,7 +152,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java
index 1fcb8328c73c..3251aaa0e152 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -602,7 +602,7 @@ public ResponseEntity testEnumParametersWithHttpInfo(List enumHead
     /**
      * Fake endpoint to test group parameters (optional)
      * Fake endpoint to test group parameters (optional)
-     * 
400 - Someting wrong
+     * 
400 - Something wrong
      * @param requiredStringGroup Required String in group parameters (required)
      * @param requiredBooleanGroup Required Boolean in group parameters (required)
      * @param requiredInt64Group Required Integer in group parameters (required)
@@ -618,7 +618,7 @@ public void testGroupParameters(Integer requiredStringGroup, Boolean requiredBoo
     /**
      * Fake endpoint to test group parameters (optional)
      * Fake endpoint to test group parameters (optional)
-     * 
400 - Someting wrong
+     * 
400 - Something wrong
      * @param requiredStringGroup Required String in group parameters (required)
      * @param requiredBooleanGroup Required Boolean in group parameters (required)
      * @param requiredInt64Group Required Integer in group parameters (required)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/StoreApi.java
index 51afdd6c2d43..b45b41c32fdb 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -136,7 +136,7 @@ public ResponseEntity> getInventoryWithHttpInfo() throws Re
     }
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * 
200 - successful operation
      * 
400 - Invalid ID supplied
      * 
404 - Order not found
@@ -150,7 +150,7 @@ public Order getOrderById(Long orderId) throws RestClientException {
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * 
200 - successful operation
      * 
400 - Invalid ID supplied
      * 
404 - Order not found
diff --git a/samples/client/petstore/java/resttemplate/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/resttemplate/src/test/java/org/openapitools/client/api/StoreApiTest.java
index b448f30ede31..0e7d086feab6 100644
--- a/samples/client/petstore/java/resttemplate/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/resttemplate/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -65,7 +65,7 @@ public void getInventoryTest() {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @throws ApiException
      *          if the Api call fails
diff --git a/samples/client/petstore/java/retrofit2-play26/api/openapi.yaml b/samples/client/petstore/java/retrofit2-play26/api/openapi.yaml
index 5f55e8c53f47..e7e17402f6fd 100644
--- a/samples/client/petstore/java/retrofit2-play26/api/openapi.yaml
+++ b/samples/client/petstore/java/retrofit2-play26/api/openapi.yaml
@@ -370,7 +370,7 @@ paths:
       x-accepts: application/json
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -672,7 +672,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/FakeApi.md b/samples/client/petstore/java/retrofit2-play26/docs/FakeApi.md
index 44193574acce..5722d2acb576 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/FakeApi.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/FakeApi.md
@@ -796,7 +796,7 @@ No authorization required
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 
 ## testInlineAdditionalProperties
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/StoreApi.md b/samples/client/petstore/java/retrofit2-play26/docs/StoreApi.md
index e6ae80525ddf..d4c6d6d98716 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/StoreApi.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/StoreApi.md
@@ -152,7 +152,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/StoreApi.java
index b9ccc8cff464..361ae3560b54 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -42,7 +42,7 @@ CompletionStage> deleteOrder(
 
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    * @param orderId ID of pet that needs to be fetched (required)
    * @return Call<Order>
    */
diff --git a/samples/client/petstore/java/retrofit2-play26/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/retrofit2-play26/src/test/java/org/openapitools/client/api/StoreApiTest.java
index 90c204243b9b..8cb33d8fd169 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -43,7 +43,7 @@ public void getInventoryTest() {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      */
     @Test
     public void getOrderByIdTest() {
diff --git a/samples/client/petstore/java/retrofit2/api/openapi.yaml b/samples/client/petstore/java/retrofit2/api/openapi.yaml
index 5f55e8c53f47..e7e17402f6fd 100644
--- a/samples/client/petstore/java/retrofit2/api/openapi.yaml
+++ b/samples/client/petstore/java/retrofit2/api/openapi.yaml
@@ -370,7 +370,7 @@ paths:
       x-accepts: application/json
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -672,7 +672,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/client/petstore/java/retrofit2/docs/FakeApi.md b/samples/client/petstore/java/retrofit2/docs/FakeApi.md
index 44193574acce..5722d2acb576 100644
--- a/samples/client/petstore/java/retrofit2/docs/FakeApi.md
+++ b/samples/client/petstore/java/retrofit2/docs/FakeApi.md
@@ -796,7 +796,7 @@ No authorization required
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 
 ## testInlineAdditionalProperties
diff --git a/samples/client/petstore/java/retrofit2/docs/StoreApi.md b/samples/client/petstore/java/retrofit2/docs/StoreApi.md
index e6ae80525ddf..d4c6d6d98716 100644
--- a/samples/client/petstore/java/retrofit2/docs/StoreApi.md
+++ b/samples/client/petstore/java/retrofit2/docs/StoreApi.md
@@ -152,7 +152,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/StoreApi.java
index f4fd28bd1dae..3a71697751cb 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -39,7 +39,7 @@ Call deleteOrder(
 
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    * @param orderId ID of pet that needs to be fetched (required)
    * @return Call<Order>
    */
diff --git a/samples/client/petstore/java/retrofit2/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/retrofit2/src/test/java/org/openapitools/client/api/StoreApiTest.java
index 15455ccabb20..2f72f617c3ab 100644
--- a/samples/client/petstore/java/retrofit2/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/retrofit2/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -48,7 +48,7 @@ public void getInventoryTest() {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      */
     @Test
     public void getOrderByIdTest() {
diff --git a/samples/client/petstore/java/retrofit2rx2/api/openapi.yaml b/samples/client/petstore/java/retrofit2rx2/api/openapi.yaml
index 5f55e8c53f47..e7e17402f6fd 100644
--- a/samples/client/petstore/java/retrofit2rx2/api/openapi.yaml
+++ b/samples/client/petstore/java/retrofit2rx2/api/openapi.yaml
@@ -370,7 +370,7 @@ paths:
       x-accepts: application/json
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -672,7 +672,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/FakeApi.md b/samples/client/petstore/java/retrofit2rx2/docs/FakeApi.md
index 44193574acce..5722d2acb576 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/FakeApi.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/FakeApi.md
@@ -796,7 +796,7 @@ No authorization required
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 
 ## testInlineAdditionalProperties
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/StoreApi.md b/samples/client/petstore/java/retrofit2rx2/docs/StoreApi.md
index e6ae80525ddf..d4c6d6d98716 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/StoreApi.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/StoreApi.md
@@ -152,7 +152,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/StoreApi.java
index d45f42a71505..c865bfbe53e8 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -40,7 +40,7 @@ Completable deleteOrder(
 
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    * @param orderId ID of pet that needs to be fetched (required)
    * @return Observable<Order>
    */
diff --git a/samples/client/petstore/java/retrofit2rx2/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/retrofit2rx2/src/test/java/org/openapitools/client/api/StoreApiTest.java
index 15455ccabb20..2f72f617c3ab 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -48,7 +48,7 @@ public void getInventoryTest() {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      */
     @Test
     public void getOrderByIdTest() {
diff --git a/samples/client/petstore/java/retrofit2rx3/api/openapi.yaml b/samples/client/petstore/java/retrofit2rx3/api/openapi.yaml
index 5f55e8c53f47..e7e17402f6fd 100644
--- a/samples/client/petstore/java/retrofit2rx3/api/openapi.yaml
+++ b/samples/client/petstore/java/retrofit2rx3/api/openapi.yaml
@@ -370,7 +370,7 @@ paths:
       x-accepts: application/json
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -672,7 +672,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/FakeApi.md b/samples/client/petstore/java/retrofit2rx3/docs/FakeApi.md
index 44193574acce..5722d2acb576 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/FakeApi.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/FakeApi.md
@@ -796,7 +796,7 @@ No authorization required
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 
 ## testInlineAdditionalProperties
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/StoreApi.md b/samples/client/petstore/java/retrofit2rx3/docs/StoreApi.md
index e6ae80525ddf..d4c6d6d98716 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/StoreApi.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/StoreApi.md
@@ -152,7 +152,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/StoreApi.java
index 99ada34679ba..2002a8e3092e 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -40,7 +40,7 @@ Completable deleteOrder(
 
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    * @param orderId ID of pet that needs to be fetched (required)
    * @return Observable<Order>
    */
diff --git a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/api/StoreApiTest.java
index 00ebb3349f88..e02a6df70825 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -48,7 +48,7 @@ public void getInventoryTest() {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      */
     @Test
     public void getOrderByIdTest() {
diff --git a/samples/client/petstore/java/vertx-no-nullable/api/openapi.yaml b/samples/client/petstore/java/vertx-no-nullable/api/openapi.yaml
index 5f55e8c53f47..e7e17402f6fd 100644
--- a/samples/client/petstore/java/vertx-no-nullable/api/openapi.yaml
+++ b/samples/client/petstore/java/vertx-no-nullable/api/openapi.yaml
@@ -370,7 +370,7 @@ paths:
       x-accepts: application/json
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -672,7 +672,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/FakeApi.md b/samples/client/petstore/java/vertx-no-nullable/docs/FakeApi.md
index f6ce519861c9..efb255c14f26 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/FakeApi.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/FakeApi.md
@@ -796,7 +796,7 @@ No authorization required
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 
 ## testInlineAdditionalProperties
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/StoreApi.md b/samples/client/petstore/java/vertx-no-nullable/docs/StoreApi.md
index 571e808abdfb..b64e208a83a3 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/StoreApi.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/StoreApi.md
@@ -152,7 +152,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/api/StoreApiImpl.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/api/StoreApiImpl.java
index bc264d4447e0..762970b72d9b 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/api/StoreApiImpl.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/api/StoreApiImpl.java
@@ -130,7 +130,7 @@ public void getInventory(ApiClient.AuthInfo authInfo, Handler> resultHandler
 
     /**
     * Find purchase order by ID
-    * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
     * @param orderId ID of pet that needs to be fetched (required)
     * @param authInfo per call authentication override.
     * @param resultHandler Asynchronous result handler
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/api/rxjava/StoreApi.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/api/rxjava/StoreApi.java
index d8972b50a133..472da15fc3c0 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/api/rxjava/StoreApi.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/api/rxjava/StoreApi.java
@@ -110,7 +110,7 @@ public Single> rxGetInventory(ApiClient.AuthInfo authInfo)
     }
     /**
     * Find purchase order by ID
-    * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
     * @param orderId ID of pet that needs to be fetched (required)
     * @param resultHandler Asynchronous result handler
     */
@@ -120,7 +120,7 @@ public void getOrderById(Long orderId, Handler> resultHandler
 
     /**
     * Find purchase order by ID
-    * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
     * @param orderId ID of pet that needs to be fetched (required)
     * @param authInfo call specific auth overrides
     * @param resultHandler Asynchronous result handler
@@ -131,7 +131,7 @@ public void getOrderById(Long orderId, ApiClient.AuthInfo authInfo, Handler rxGetOrderById(Long orderId) {
 
     /**
     * Find purchase order by ID
-    * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
     * @param orderId ID of pet that needs to be fetched (required)
     * @param authInfo call specific auth overrides
     * @return Asynchronous result handler (RxJava Single)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/vertx-no-nullable/src/test/java/org/openapitools/client/api/StoreApiTest.java
index 7c12d7f56623..5581be91dc8d 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -90,7 +90,7 @@ public void getInventoryTest(TestContext testContext) {
     
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param context Vertx test context for doing assertions
      */
diff --git a/samples/client/petstore/java/vertx/api/openapi.yaml b/samples/client/petstore/java/vertx/api/openapi.yaml
index 5f55e8c53f47..e7e17402f6fd 100644
--- a/samples/client/petstore/java/vertx/api/openapi.yaml
+++ b/samples/client/petstore/java/vertx/api/openapi.yaml
@@ -370,7 +370,7 @@ paths:
       x-accepts: application/json
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -672,7 +672,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/client/petstore/java/vertx/docs/FakeApi.md b/samples/client/petstore/java/vertx/docs/FakeApi.md
index f6ce519861c9..efb255c14f26 100644
--- a/samples/client/petstore/java/vertx/docs/FakeApi.md
+++ b/samples/client/petstore/java/vertx/docs/FakeApi.md
@@ -796,7 +796,7 @@ No authorization required
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 
 ## testInlineAdditionalProperties
diff --git a/samples/client/petstore/java/vertx/docs/StoreApi.md b/samples/client/petstore/java/vertx/docs/StoreApi.md
index 571e808abdfb..b64e208a83a3 100644
--- a/samples/client/petstore/java/vertx/docs/StoreApi.md
+++ b/samples/client/petstore/java/vertx/docs/StoreApi.md
@@ -152,7 +152,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/StoreApiImpl.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/StoreApiImpl.java
index bc264d4447e0..762970b72d9b 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/StoreApiImpl.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/StoreApiImpl.java
@@ -130,7 +130,7 @@ public void getInventory(ApiClient.AuthInfo authInfo, Handler> resultHandler
 
     /**
     * Find purchase order by ID
-    * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
     * @param orderId ID of pet that needs to be fetched (required)
     * @param authInfo per call authentication override.
     * @param resultHandler Asynchronous result handler
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/StoreApi.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/StoreApi.java
index d8972b50a133..472da15fc3c0 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/StoreApi.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/StoreApi.java
@@ -110,7 +110,7 @@ public Single> rxGetInventory(ApiClient.AuthInfo authInfo)
     }
     /**
     * Find purchase order by ID
-    * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
     * @param orderId ID of pet that needs to be fetched (required)
     * @param resultHandler Asynchronous result handler
     */
@@ -120,7 +120,7 @@ public void getOrderById(Long orderId, Handler> resultHandler
 
     /**
     * Find purchase order by ID
-    * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
     * @param orderId ID of pet that needs to be fetched (required)
     * @param authInfo call specific auth overrides
     * @param resultHandler Asynchronous result handler
@@ -131,7 +131,7 @@ public void getOrderById(Long orderId, ApiClient.AuthInfo authInfo, Handler rxGetOrderById(Long orderId) {
 
     /**
     * Find purchase order by ID
-    * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
     * @param orderId ID of pet that needs to be fetched (required)
     * @param authInfo call specific auth overrides
     * @return Asynchronous result handler (RxJava Single)
diff --git a/samples/client/petstore/java/vertx/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/vertx/src/test/java/org/openapitools/client/api/StoreApiTest.java
index 3b96f8699ff0..6765ad932d0f 100644
--- a/samples/client/petstore/java/vertx/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/vertx/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -90,7 +90,7 @@ public void getInventoryTest(TestContext context) {
     
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param context Vertx test context for doing assertions
      */
diff --git a/samples/client/petstore/java/webclient-nulable-arrays/.github/workflows/maven.yml b/samples/client/petstore/java/webclient-nullable-arrays/.github/workflows/maven.yml
similarity index 100%
rename from samples/client/petstore/java/webclient-nulable-arrays/.github/workflows/maven.yml
rename to samples/client/petstore/java/webclient-nullable-arrays/.github/workflows/maven.yml
diff --git a/samples/client/petstore/java/webclient-nulable-arrays/.gitignore b/samples/client/petstore/java/webclient-nullable-arrays/.gitignore
similarity index 100%
rename from samples/client/petstore/java/webclient-nulable-arrays/.gitignore
rename to samples/client/petstore/java/webclient-nullable-arrays/.gitignore
diff --git a/samples/client/petstore/java/webclient-nulable-arrays/.openapi-generator-ignore b/samples/client/petstore/java/webclient-nullable-arrays/.openapi-generator-ignore
similarity index 100%
rename from samples/client/petstore/java/webclient-nulable-arrays/.openapi-generator-ignore
rename to samples/client/petstore/java/webclient-nullable-arrays/.openapi-generator-ignore
diff --git a/samples/client/petstore/java/webclient-nulable-arrays/.openapi-generator/FILES b/samples/client/petstore/java/webclient-nullable-arrays/.openapi-generator/FILES
similarity index 100%
rename from samples/client/petstore/java/webclient-nulable-arrays/.openapi-generator/FILES
rename to samples/client/petstore/java/webclient-nullable-arrays/.openapi-generator/FILES
diff --git a/samples/client/petstore/java/webclient-nulable-arrays/.openapi-generator/VERSION b/samples/client/petstore/java/webclient-nullable-arrays/.openapi-generator/VERSION
similarity index 100%
rename from samples/client/petstore/java/webclient-nulable-arrays/.openapi-generator/VERSION
rename to samples/client/petstore/java/webclient-nullable-arrays/.openapi-generator/VERSION
diff --git a/samples/client/petstore/java/webclient-nulable-arrays/.travis.yml b/samples/client/petstore/java/webclient-nullable-arrays/.travis.yml
similarity index 100%
rename from samples/client/petstore/java/webclient-nulable-arrays/.travis.yml
rename to samples/client/petstore/java/webclient-nullable-arrays/.travis.yml
diff --git a/samples/client/petstore/java/webclient-nulable-arrays/README.md b/samples/client/petstore/java/webclient-nullable-arrays/README.md
similarity index 100%
rename from samples/client/petstore/java/webclient-nulable-arrays/README.md
rename to samples/client/petstore/java/webclient-nullable-arrays/README.md
diff --git a/samples/client/petstore/java/webclient-nulable-arrays/api/openapi.yaml b/samples/client/petstore/java/webclient-nullable-arrays/api/openapi.yaml
similarity index 100%
rename from samples/client/petstore/java/webclient-nulable-arrays/api/openapi.yaml
rename to samples/client/petstore/java/webclient-nullable-arrays/api/openapi.yaml
diff --git a/samples/client/petstore/java/webclient-nulable-arrays/build.gradle b/samples/client/petstore/java/webclient-nullable-arrays/build.gradle
similarity index 100%
rename from samples/client/petstore/java/webclient-nulable-arrays/build.gradle
rename to samples/client/petstore/java/webclient-nullable-arrays/build.gradle
diff --git a/samples/client/petstore/java/webclient-nulable-arrays/build.sbt b/samples/client/petstore/java/webclient-nullable-arrays/build.sbt
similarity index 100%
rename from samples/client/petstore/java/webclient-nulable-arrays/build.sbt
rename to samples/client/petstore/java/webclient-nullable-arrays/build.sbt
diff --git a/samples/client/petstore/java/webclient-nulable-arrays/docs/ByteArrayObject.md b/samples/client/petstore/java/webclient-nullable-arrays/docs/ByteArrayObject.md
similarity index 100%
rename from samples/client/petstore/java/webclient-nulable-arrays/docs/ByteArrayObject.md
rename to samples/client/petstore/java/webclient-nullable-arrays/docs/ByteArrayObject.md
diff --git a/samples/client/petstore/java/webclient-nulable-arrays/docs/DefaultApi.md b/samples/client/petstore/java/webclient-nullable-arrays/docs/DefaultApi.md
similarity index 100%
rename from samples/client/petstore/java/webclient-nulable-arrays/docs/DefaultApi.md
rename to samples/client/petstore/java/webclient-nullable-arrays/docs/DefaultApi.md
diff --git a/samples/client/petstore/java/webclient-nulable-arrays/git_push.sh b/samples/client/petstore/java/webclient-nullable-arrays/git_push.sh
similarity index 100%
rename from samples/client/petstore/java/webclient-nulable-arrays/git_push.sh
rename to samples/client/petstore/java/webclient-nullable-arrays/git_push.sh
diff --git a/samples/client/petstore/java/webclient-nulable-arrays/gradle.properties b/samples/client/petstore/java/webclient-nullable-arrays/gradle.properties
similarity index 100%
rename from samples/client/petstore/java/webclient-nulable-arrays/gradle.properties
rename to samples/client/petstore/java/webclient-nullable-arrays/gradle.properties
diff --git a/samples/client/petstore/java/webclient-nulable-arrays/gradle/wrapper/gradle-wrapper.jar b/samples/client/petstore/java/webclient-nullable-arrays/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from samples/client/petstore/java/webclient-nulable-arrays/gradle/wrapper/gradle-wrapper.jar
rename to samples/client/petstore/java/webclient-nullable-arrays/gradle/wrapper/gradle-wrapper.jar
diff --git a/samples/client/petstore/java/webclient-nulable-arrays/gradle/wrapper/gradle-wrapper.properties b/samples/client/petstore/java/webclient-nullable-arrays/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from samples/client/petstore/java/webclient-nulable-arrays/gradle/wrapper/gradle-wrapper.properties
rename to samples/client/petstore/java/webclient-nullable-arrays/gradle/wrapper/gradle-wrapper.properties
diff --git a/samples/client/petstore/java/webclient-nulable-arrays/gradlew b/samples/client/petstore/java/webclient-nullable-arrays/gradlew
similarity index 100%
rename from samples/client/petstore/java/webclient-nulable-arrays/gradlew
rename to samples/client/petstore/java/webclient-nullable-arrays/gradlew
diff --git a/samples/client/petstore/java/webclient-nulable-arrays/gradlew.bat b/samples/client/petstore/java/webclient-nullable-arrays/gradlew.bat
similarity index 100%
rename from samples/client/petstore/java/webclient-nulable-arrays/gradlew.bat
rename to samples/client/petstore/java/webclient-nullable-arrays/gradlew.bat
diff --git a/samples/client/petstore/java/webclient-nulable-arrays/pom.xml b/samples/client/petstore/java/webclient-nullable-arrays/pom.xml
similarity index 100%
rename from samples/client/petstore/java/webclient-nulable-arrays/pom.xml
rename to samples/client/petstore/java/webclient-nullable-arrays/pom.xml
diff --git a/samples/client/petstore/java/webclient-nulable-arrays/settings.gradle b/samples/client/petstore/java/webclient-nullable-arrays/settings.gradle
similarity index 100%
rename from samples/client/petstore/java/webclient-nulable-arrays/settings.gradle
rename to samples/client/petstore/java/webclient-nullable-arrays/settings.gradle
diff --git a/samples/client/petstore/java/webclient-nulable-arrays/src/main/AndroidManifest.xml b/samples/client/petstore/java/webclient-nullable-arrays/src/main/AndroidManifest.xml
similarity index 100%
rename from samples/client/petstore/java/webclient-nulable-arrays/src/main/AndroidManifest.xml
rename to samples/client/petstore/java/webclient-nullable-arrays/src/main/AndroidManifest.xml
diff --git a/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/ApiClient.java
similarity index 100%
rename from samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/ApiClient.java
rename to samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/ApiClient.java
diff --git a/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/JavaTimeFormatter.java b/samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/JavaTimeFormatter.java
similarity index 100%
rename from samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/JavaTimeFormatter.java
rename to samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/JavaTimeFormatter.java
diff --git a/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/RFC3339DateFormat.java b/samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/RFC3339DateFormat.java
similarity index 100%
rename from samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/RFC3339DateFormat.java
rename to samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/RFC3339DateFormat.java
diff --git a/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/ServerConfiguration.java b/samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/ServerConfiguration.java
similarity index 100%
rename from samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/ServerConfiguration.java
rename to samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/ServerConfiguration.java
diff --git a/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/ServerVariable.java b/samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/ServerVariable.java
similarity index 100%
rename from samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/ServerVariable.java
rename to samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/ServerVariable.java
diff --git a/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/StringUtil.java b/samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/StringUtil.java
similarity index 100%
rename from samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/StringUtil.java
rename to samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/StringUtil.java
diff --git a/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/api/DefaultApi.java
similarity index 100%
rename from samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/api/DefaultApi.java
rename to samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/api/DefaultApi.java
diff --git a/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
similarity index 100%
rename from samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
rename to samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
diff --git a/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/auth/Authentication.java b/samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/auth/Authentication.java
similarity index 100%
rename from samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/auth/Authentication.java
rename to samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/auth/Authentication.java
diff --git a/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
similarity index 100%
rename from samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
rename to samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
diff --git a/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java b/samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
similarity index 100%
rename from samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
rename to samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
diff --git a/samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/model/ByteArrayObject.java b/samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/model/ByteArrayObject.java
similarity index 100%
rename from samples/client/petstore/java/webclient-nulable-arrays/src/main/java/org/openapitools/client/model/ByteArrayObject.java
rename to samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/model/ByteArrayObject.java
diff --git a/samples/client/petstore/java/webclient-nulable-arrays/src/test/java/org/openapitools/client/api/DefaultApiTest.java b/samples/client/petstore/java/webclient-nullable-arrays/src/test/java/org/openapitools/client/api/DefaultApiTest.java
similarity index 100%
rename from samples/client/petstore/java/webclient-nulable-arrays/src/test/java/org/openapitools/client/api/DefaultApiTest.java
rename to samples/client/petstore/java/webclient-nullable-arrays/src/test/java/org/openapitools/client/api/DefaultApiTest.java
diff --git a/samples/client/petstore/java/webclient-nulable-arrays/src/test/java/org/openapitools/client/model/ByteArrayObjectTest.java b/samples/client/petstore/java/webclient-nullable-arrays/src/test/java/org/openapitools/client/model/ByteArrayObjectTest.java
similarity index 100%
rename from samples/client/petstore/java/webclient-nulable-arrays/src/test/java/org/openapitools/client/model/ByteArrayObjectTest.java
rename to samples/client/petstore/java/webclient-nullable-arrays/src/test/java/org/openapitools/client/model/ByteArrayObjectTest.java
diff --git a/samples/client/petstore/java/webclient/api/openapi.yaml b/samples/client/petstore/java/webclient/api/openapi.yaml
index f54c98c7f7bf..f9cbedf1e42f 100644
--- a/samples/client/petstore/java/webclient/api/openapi.yaml
+++ b/samples/client/petstore/java/webclient/api/openapi.yaml
@@ -412,7 +412,7 @@ paths:
       x-accepts: application/json
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -712,7 +712,7 @@ paths:
         style: form
       responses:
         "400":
-          description: Someting wrong
+          description: Something wrong
       security:
       - bearer_test: []
       summary: Fake endpoint to test group parameters (optional)
diff --git a/samples/client/petstore/java/webclient/docs/FakeApi.md b/samples/client/petstore/java/webclient/docs/FakeApi.md
index 1b6b9507990d..853a8de53777 100644
--- a/samples/client/petstore/java/webclient/docs/FakeApi.md
+++ b/samples/client/petstore/java/webclient/docs/FakeApi.md
@@ -1001,7 +1001,7 @@ null (empty response body)
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 
 ## testInlineAdditionalProperties
diff --git a/samples/client/petstore/java/webclient/docs/StoreApi.md b/samples/client/petstore/java/webclient/docs/StoreApi.md
index e3b7d7b910cc..ce91137cc6f4 100644
--- a/samples/client/petstore/java/webclient/docs/StoreApi.md
+++ b/samples/client/petstore/java/webclient/docs/StoreApi.md
@@ -152,7 +152,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java
index 8287c0635341..5c63a2ddbc1a 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -1132,7 +1132,7 @@ public ResponseSpec testEnumParametersWithResponseSpec(List enumHeaderSt
     /**
      * Fake endpoint to test group parameters (optional)
      * Fake endpoint to test group parameters (optional)
-     * 
400 - Someting wrong
+     * 
400 - Something wrong
      * @param requiredStringGroup Required String in group parameters
      * @param requiredBooleanGroup Required Boolean in group parameters
      * @param requiredInt64Group Required Integer in group parameters
@@ -1186,7 +1186,7 @@ private ResponseSpec testGroupParametersRequestCreation(Integer requiredStringGr
     /**
      * Fake endpoint to test group parameters (optional)
      * Fake endpoint to test group parameters (optional)
-     * 
400 - Someting wrong
+     * 
400 - Something wrong
      * @param requiredStringGroup Required String in group parameters
      * @param requiredBooleanGroup Required Boolean in group parameters
      * @param requiredInt64Group Required Integer in group parameters
@@ -1203,7 +1203,7 @@ public Mono testGroupParameters(Integer requiredStringGroup, Boolean requi
     /**
      * Fake endpoint to test group parameters (optional)
      * Fake endpoint to test group parameters (optional)
-     * 
400 - Someting wrong
+     * 
400 - Something wrong
      * @param requiredStringGroup Required String in group parameters
      * @param requiredBooleanGroup Required Boolean in group parameters
      * @param requiredInt64Group Required Integer in group parameters
@@ -1220,7 +1220,7 @@ public Mono> testGroupParametersWithHttpInfo(Integer requir
     /**
      * Fake endpoint to test group parameters (optional)
      * Fake endpoint to test group parameters (optional)
-     * 
400 - Someting wrong
+     * 
400 - Something wrong
      * @param requiredStringGroup Required String in group parameters
      * @param requiredBooleanGroup Required Boolean in group parameters
      * @param requiredInt64Group Required Integer in group parameters
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/StoreApi.java
index 27426959355d..640efc67d3c6 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -185,7 +185,7 @@ public ResponseSpec getInventoryWithResponseSpec() throws WebClientResponseExcep
     }
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * 
200 - successful operation
      * 
400 - Invalid ID supplied
      * 
404 - Order not found
@@ -224,7 +224,7 @@ private ResponseSpec getOrderByIdRequestCreation(Long orderId) throws WebClientR
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * 
200 - successful operation
      * 
400 - Invalid ID supplied
      * 
404 - Order not found
@@ -239,7 +239,7 @@ public Mono getOrderById(Long orderId) throws WebClientResponseException
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * 
200 - successful operation
      * 
400 - Invalid ID supplied
      * 
404 - Order not found
@@ -254,7 +254,7 @@ public Mono> getOrderByIdWithHttpInfo(Long orderId) throws
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * 
200 - successful operation
      * 
400 - Invalid ID supplied
      * 
404 - Order not found
diff --git a/samples/client/petstore/java/webclient/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/webclient/src/test/java/org/openapitools/client/api/StoreApiTest.java
index bb3455afaa50..4e4841aa45cd 100644
--- a/samples/client/petstore/java/webclient/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/webclient/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -60,7 +60,7 @@ public void getInventoryTest()  {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      */
     @Test
     public void getOrderByIdTest()  {
diff --git a/samples/client/petstore/javascript-apollo/docs/StoreApi.md b/samples/client/petstore/javascript-apollo/docs/StoreApi.md
index b7abc576af49..6689c3da6f66 100644
--- a/samples/client/petstore/javascript-apollo/docs/StoreApi.md
+++ b/samples/client/petstore/javascript-apollo/docs/StoreApi.md
@@ -109,7 +109,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/javascript-apollo/src/api/StoreApi.js b/samples/client/petstore/javascript-apollo/src/api/StoreApi.js
index 96c269f27ae3..f91d5f7893e0 100644
--- a/samples/client/petstore/javascript-apollo/src/api/StoreApi.js
+++ b/samples/client/petstore/javascript-apollo/src/api/StoreApi.js
@@ -103,7 +103,7 @@ export default class StoreApi extends ApiClient {
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param {Number} orderId ID of pet that needs to be fetched
      * @param requestInit Dynamic configuration. @see {@link https://github.com/apollographql/apollo-server/pull/1277}
      * @return {Promise}
diff --git a/samples/client/petstore/javascript-apollo/src/model/Color.js b/samples/client/petstore/javascript-apollo/src/model/Color.js
index b071fff068a6..cdeb9bf6158c 100644
--- a/samples/client/petstore/javascript-apollo/src/model/Color.js
+++ b/samples/client/petstore/javascript-apollo/src/model/Color.js
@@ -124,7 +124,7 @@ class Color {
     }
 
     /**
-     * Gets the actaul instance, which can be String, [Number].
+     * Gets the actual instance, which can be String, [Number].
      * @return {(module:model/String|module:model/[Number])} The actual instance.
      */
     getActualInstance() {
@@ -132,7 +132,7 @@ class Color {
     }
 
     /**
-     * Sets the actaul instance, which can be String, [Number].
+     * Sets the actual instance, which can be String, [Number].
      * @param {(module:model/String|module:model/[Number])} obj The actual instance.
      */
     setActualInstance(obj) {
@@ -140,7 +140,7 @@ class Color {
     }
 
     /**
-     * Returns the JSON representation of the actual intance.
+     * Returns the JSON representation of the actual instance.
      * @return {string}
      */
     toJSON = function(){
diff --git a/samples/client/petstore/javascript-apollo/src/model/Pig.js b/samples/client/petstore/javascript-apollo/src/model/Pig.js
index da6cdc076563..222a3e27d413 100644
--- a/samples/client/petstore/javascript-apollo/src/model/Pig.js
+++ b/samples/client/petstore/javascript-apollo/src/model/Pig.js
@@ -88,7 +88,7 @@ class Pig {
     }
 
     /**
-     * Gets the actaul instance, which can be BasquePig, DanishPig.
+     * Gets the actual instance, which can be BasquePig, DanishPig.
      * @return {(module:model/BasquePig|module:model/DanishPig)} The actual instance.
      */
     getActualInstance() {
@@ -96,7 +96,7 @@ class Pig {
     }
 
     /**
-     * Sets the actaul instance, which can be BasquePig, DanishPig.
+     * Sets the actual instance, which can be BasquePig, DanishPig.
      * @param {(module:model/BasquePig|module:model/DanishPig)} obj The actual instance.
      */
     setActualInstance(obj) {
@@ -104,7 +104,7 @@ class Pig {
     }
 
     /**
-     * Returns the JSON representation of the actual intance.
+     * Returns the JSON representation of the actual instance.
      * @return {string}
      */
     toJSON = function(){
diff --git a/samples/client/petstore/javascript-closure-angular/API/Client/StoreApi.js b/samples/client/petstore/javascript-closure-angular/API/Client/StoreApi.js
index 6df64168d26f..05ac14953e97 100644
--- a/samples/client/petstore/javascript-closure-angular/API/Client/StoreApi.js
+++ b/samples/client/petstore/javascript-closure-angular/API/Client/StoreApi.js
@@ -113,7 +113,7 @@ API.Client.StoreApi.prototype.getInventory = function(opt_extraHttpRequestParams
 
 /**
  * Find purchase order by ID
- * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+ * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
  * @param {!number} orderId ID of pet that needs to be fetched
  * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
  * @return {!angular.$q.Promise}
diff --git a/samples/client/petstore/javascript-closure-angular/lib/goog/base.js b/samples/client/petstore/javascript-closure-angular/lib/goog/base.js
index 5cd6e45ebd08..c462428f3161 100644
--- a/samples/client/petstore/javascript-closure-angular/lib/goog/base.js
+++ b/samples/client/petstore/javascript-closure-angular/lib/goog/base.js
@@ -282,7 +282,7 @@ goog.addDependency = function(relPath, provides, requires) {
 
 
 
-// NOTE(nnaze): The debug DOM loader was included in base.js as an orignal
+// NOTE(nnaze): The debug DOM loader was included in base.js as an original
 // way to do "debug-mode" development.  The dependency system can sometimes
 // be confusing, as can the debug DOM loader's asynchronous nature.
 //
@@ -324,7 +324,7 @@ goog.ENABLE_DEBUG_LOADER = true;
  */
 goog.require = function(name) {
 
-  // if the object already exists we do not need do do anything
+  // if the object already exists we do not need do anything
   // TODO(arv): If we start to support require based on file name this has
   //            to change
   // TODO(arv): If we allow goog.foo.* this has to change
@@ -687,7 +687,7 @@ goog.typeOf = function(value) {
       // Check these first, so we can avoid calling Object.prototype.toString if
       // possible.
       //
-      // IE improperly marshals tyepof across execution contexts, but a
+      // IE improperly marshals typeof across execution contexts, but a
       // cross-context object will still return false for "instanceof Object".
       if (value instanceof Array) {
         return 'array';
@@ -1378,7 +1378,7 @@ goog.getMsg = function(str, opt_values) {
  * This is useful when introducing a new message that has not yet been
  * translated into all languages.
  *
- * This function is a compiler primtive. Must be used in the form:
+ * This function is a compiler primitive. Must be used in the form:
  * var x = goog.getMsgWithFallback(MSG_A, MSG_B);
  * where MSG_A and MSG_B were initialized with goog.getMsg.
  *
@@ -1478,7 +1478,7 @@ goog.inherits = function(childCtor, parentCtor) {
  * Call up to the superclass.
  *
  * If this is called from a constructor, then this calls the superclass
- * contructor with arguments 1-N.
+ * constructor with arguments 1-N.
  *
  * If this is called from a prototype method, then you must pass
  * the name of the method as the second argument to this function. If
diff --git a/samples/client/petstore/javascript-es6/docs/StoreApi.md b/samples/client/petstore/javascript-es6/docs/StoreApi.md
index b7abc576af49..6689c3da6f66 100644
--- a/samples/client/petstore/javascript-es6/docs/StoreApi.md
+++ b/samples/client/petstore/javascript-es6/docs/StoreApi.md
@@ -109,7 +109,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/javascript-es6/src/api/StoreApi.js b/samples/client/petstore/javascript-es6/src/api/StoreApi.js
index ae1d1ea977d4..21791c50e2f3 100644
--- a/samples/client/petstore/javascript-es6/src/api/StoreApi.js
+++ b/samples/client/petstore/javascript-es6/src/api/StoreApi.js
@@ -123,7 +123,7 @@ export default class StoreApi {
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param {Number} orderId ID of pet that needs to be fetched
      * @param {module:api/StoreApi~getOrderByIdCallback} callback The callback function, accepting three arguments: error, data, response
      * data is of type: {@link module:model/Order}
diff --git a/samples/client/petstore/javascript-es6/src/model/Color.js b/samples/client/petstore/javascript-es6/src/model/Color.js
index b071fff068a6..cdeb9bf6158c 100644
--- a/samples/client/petstore/javascript-es6/src/model/Color.js
+++ b/samples/client/petstore/javascript-es6/src/model/Color.js
@@ -124,7 +124,7 @@ class Color {
     }
 
     /**
-     * Gets the actaul instance, which can be String, [Number].
+     * Gets the actual instance, which can be String, [Number].
      * @return {(module:model/String|module:model/[Number])} The actual instance.
      */
     getActualInstance() {
@@ -132,7 +132,7 @@ class Color {
     }
 
     /**
-     * Sets the actaul instance, which can be String, [Number].
+     * Sets the actual instance, which can be String, [Number].
      * @param {(module:model/String|module:model/[Number])} obj The actual instance.
      */
     setActualInstance(obj) {
@@ -140,7 +140,7 @@ class Color {
     }
 
     /**
-     * Returns the JSON representation of the actual intance.
+     * Returns the JSON representation of the actual instance.
      * @return {string}
      */
     toJSON = function(){
diff --git a/samples/client/petstore/javascript-es6/src/model/Pig.js b/samples/client/petstore/javascript-es6/src/model/Pig.js
index da6cdc076563..222a3e27d413 100644
--- a/samples/client/petstore/javascript-es6/src/model/Pig.js
+++ b/samples/client/petstore/javascript-es6/src/model/Pig.js
@@ -88,7 +88,7 @@ class Pig {
     }
 
     /**
-     * Gets the actaul instance, which can be BasquePig, DanishPig.
+     * Gets the actual instance, which can be BasquePig, DanishPig.
      * @return {(module:model/BasquePig|module:model/DanishPig)} The actual instance.
      */
     getActualInstance() {
@@ -96,7 +96,7 @@ class Pig {
     }
 
     /**
-     * Sets the actaul instance, which can be BasquePig, DanishPig.
+     * Sets the actual instance, which can be BasquePig, DanishPig.
      * @param {(module:model/BasquePig|module:model/DanishPig)} obj The actual instance.
      */
     setActualInstance(obj) {
@@ -104,7 +104,7 @@ class Pig {
     }
 
     /**
-     * Returns the JSON representation of the actual intance.
+     * Returns the JSON representation of the actual instance.
      * @return {string}
      */
     toJSON = function(){
diff --git a/samples/client/petstore/javascript-flowtyped/README.md b/samples/client/petstore/javascript-flowtyped/README.md
index 9c2bec573350..be99fb0c8071 100644
--- a/samples/client/petstore/javascript-flowtyped/README.md
+++ b/samples/client/petstore/javascript-flowtyped/README.md
@@ -15,7 +15,7 @@ Module system
 
 ### Building
 
-To build an compile the flow typed sources to javascript use:
+To build and compile the flow typed sources to javascript use:
 ```
 npm install
 # The dependency `babel-preset-react-app` requires that you specify `NODE_ENV` or `BABEL_ENV` environment variables
diff --git a/samples/client/petstore/javascript-flowtyped/lib/api.js b/samples/client/petstore/javascript-flowtyped/lib/api.js
index eca41f9154b8..833e872bda6e 100644
--- a/samples/client/petstore/javascript-flowtyped/lib/api.js
+++ b/samples/client/petstore/javascript-flowtyped/lib/api.js
@@ -599,7 +599,7 @@ const StoreApiFetchParamCreator = function (configuration) {
     },
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @summary Find purchase order by ID
      * @throws {RequiredError}
      */
@@ -702,7 +702,7 @@ const StoreApi = function (configuration, fetch = portableFetch) {
     },
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @summary Find purchase order by ID
      * @throws {RequiredError}
      */
diff --git a/samples/client/petstore/javascript-flowtyped/lib/api.js.flow b/samples/client/petstore/javascript-flowtyped/lib/api.js.flow
index d839e160bb3e..7d7c0363fa6b 100644
--- a/samples/client/petstore/javascript-flowtyped/lib/api.js.flow
+++ b/samples/client/petstore/javascript-flowtyped/lib/api.js.flow
@@ -823,7 +823,7 @@ export const StoreApiFetchParamCreator = function (configuration?: Configuration
             };
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @throws {RequiredError}
          */
@@ -930,7 +930,7 @@ export const StoreApi = function(configuration?: Configuration, fetch: FetchAPI
             });
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @throws {RequiredError}
          */
diff --git a/samples/client/petstore/javascript-flowtyped/src/api.js b/samples/client/petstore/javascript-flowtyped/src/api.js
index d839e160bb3e..7d7c0363fa6b 100644
--- a/samples/client/petstore/javascript-flowtyped/src/api.js
+++ b/samples/client/petstore/javascript-flowtyped/src/api.js
@@ -823,7 +823,7 @@ export const StoreApiFetchParamCreator = function (configuration?: Configuration
             };
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @throws {RequiredError}
          */
@@ -930,7 +930,7 @@ export const StoreApi = function(configuration?: Configuration, fetch: FetchAPI
             });
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @throws {RequiredError}
          */
diff --git a/samples/client/petstore/javascript-promise-es6/docs/StoreApi.md b/samples/client/petstore/javascript-promise-es6/docs/StoreApi.md
index 9ad6022bb96b..541abf7e458b 100644
--- a/samples/client/petstore/javascript-promise-es6/docs/StoreApi.md
+++ b/samples/client/petstore/javascript-promise-es6/docs/StoreApi.md
@@ -107,7 +107,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/api/StoreApi.js b/samples/client/petstore/javascript-promise-es6/src/api/StoreApi.js
index 00c7e3dca8ad..4074bb07d272 100644
--- a/samples/client/petstore/javascript-promise-es6/src/api/StoreApi.js
+++ b/samples/client/petstore/javascript-promise-es6/src/api/StoreApi.js
@@ -126,7 +126,7 @@ export default class StoreApi {
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param {Number} orderId ID of pet that needs to be fetched
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link module:model/Order} and HTTP response
      */
@@ -160,7 +160,7 @@ export default class StoreApi {
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param {Number} orderId ID of pet that needs to be fetched
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with data of type {@link module:model/Order}
      */
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/Color.js b/samples/client/petstore/javascript-promise-es6/src/model/Color.js
index b071fff068a6..cdeb9bf6158c 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/Color.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/Color.js
@@ -124,7 +124,7 @@ class Color {
     }
 
     /**
-     * Gets the actaul instance, which can be String, [Number].
+     * Gets the actual instance, which can be String, [Number].
      * @return {(module:model/String|module:model/[Number])} The actual instance.
      */
     getActualInstance() {
@@ -132,7 +132,7 @@ class Color {
     }
 
     /**
-     * Sets the actaul instance, which can be String, [Number].
+     * Sets the actual instance, which can be String, [Number].
      * @param {(module:model/String|module:model/[Number])} obj The actual instance.
      */
     setActualInstance(obj) {
@@ -140,7 +140,7 @@ class Color {
     }
 
     /**
-     * Returns the JSON representation of the actual intance.
+     * Returns the JSON representation of the actual instance.
      * @return {string}
      */
     toJSON = function(){
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/Pig.js b/samples/client/petstore/javascript-promise-es6/src/model/Pig.js
index da6cdc076563..222a3e27d413 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/Pig.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/Pig.js
@@ -88,7 +88,7 @@ class Pig {
     }
 
     /**
-     * Gets the actaul instance, which can be BasquePig, DanishPig.
+     * Gets the actual instance, which can be BasquePig, DanishPig.
      * @return {(module:model/BasquePig|module:model/DanishPig)} The actual instance.
      */
     getActualInstance() {
@@ -96,7 +96,7 @@ class Pig {
     }
 
     /**
-     * Sets the actaul instance, which can be BasquePig, DanishPig.
+     * Sets the actual instance, which can be BasquePig, DanishPig.
      * @param {(module:model/BasquePig|module:model/DanishPig)} obj The actual instance.
      */
     setActualInstance(obj) {
@@ -104,7 +104,7 @@ class Pig {
     }
 
     /**
-     * Returns the JSON representation of the actual intance.
+     * Returns the JSON representation of the actual instance.
      * @return {string}
      */
     toJSON = function(){
diff --git a/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/api/StoreApi.java
index c1216ebe2cc3..4d34cf13193d 100644
--- a/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/api/StoreApi.java
@@ -58,7 +58,7 @@ public interface StoreApi  {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      */
     @GET
diff --git a/samples/client/petstore/jaxrs-cxf-client-jackson/src/test/java/org/openapitools/api/StoreApiTest.java b/samples/client/petstore/jaxrs-cxf-client-jackson/src/test/java/org/openapitools/api/StoreApiTest.java
index 4e26ac030ebe..b87dbe2c578b 100644
--- a/samples/client/petstore/jaxrs-cxf-client-jackson/src/test/java/org/openapitools/api/StoreApiTest.java
+++ b/samples/client/petstore/jaxrs-cxf-client-jackson/src/test/java/org/openapitools/api/StoreApiTest.java
@@ -97,7 +97,7 @@ public void getInventoryTest() {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @throws ApiException
      *          if the Api call fails
diff --git a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/api/StoreApi.java
index c1216ebe2cc3..4d34cf13193d 100644
--- a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/api/StoreApi.java
@@ -58,7 +58,7 @@ public interface StoreApi  {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      */
     @GET
diff --git a/samples/client/petstore/jaxrs-cxf-client/src/test/java/org/openapitools/api/StoreApiTest.java b/samples/client/petstore/jaxrs-cxf-client/src/test/java/org/openapitools/api/StoreApiTest.java
index 8d411552a10c..537e5da2200f 100644
--- a/samples/client/petstore/jaxrs-cxf-client/src/test/java/org/openapitools/api/StoreApiTest.java
+++ b/samples/client/petstore/jaxrs-cxf-client/src/test/java/org/openapitools/api/StoreApiTest.java
@@ -109,7 +109,7 @@ public void getInventoryTest() {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @throws ApiException
      *          if the Api call fails
diff --git a/samples/client/petstore/jmeter/.openapi-generator-ignore b/samples/client/petstore/jmeter/.openapi-generator-ignore
index c5fa491b4c55..deed424f8a15 100644
--- a/samples/client/petstore/jmeter/.openapi-generator-ignore
+++ b/samples/client/petstore/jmeter/.openapi-generator-ignore
@@ -5,7 +5,7 @@
 # The patterns follow closely to .gitignore or .dockerignore.
 
 # As an example, the C# client generator defines ApiClient.cs.
-# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+# You can make changes and tell Swagger Codegen to ignore just this file by uncommenting the following line:
 #ApiClient.cs
 
 # You can match any string of characters against a directory, file or extension with a single asterisk (*):
diff --git a/samples/client/petstore/jmeter/PetApi.jmx b/samples/client/petstore/jmeter/PetApi.jmx
index fa9c1963bede..69c4866afab6 100644
--- a/samples/client/petstore/jmeter/PetApi.jmx
+++ b/samples/client/petstore/jmeter/PetApi.jmx
@@ -171,7 +171,7 @@
           
         
         
-          
+          
             ${httpStatusCode}
           
           Assertion.response_code
@@ -246,7 +246,7 @@
           
         
         
-          
+          
             ${httpStatusCode}
           
           Assertion.response_code
@@ -328,7 +328,7 @@
           
         
         
-          
+          
             ${httpStatusCode}
           
           Assertion.response_code
@@ -410,7 +410,7 @@
           
         
         
-          
+          
             ${httpStatusCode}
           
           Assertion.response_code
@@ -485,7 +485,7 @@
           
         
         
-          
+          
             ${httpStatusCode}
           
           Assertion.response_code
@@ -565,7 +565,7 @@
           
         
         
-          
+          
             ${httpStatusCode}
           
           Assertion.response_code
@@ -640,7 +640,7 @@
           
         
         
-          
+          
             ${httpStatusCode}
           
           Assertion.response_code
@@ -719,7 +719,7 @@
           
         
         
-          
+          
             ${httpStatusCode}
           
           Assertion.response_code
diff --git a/samples/client/petstore/jmeter/StoreApi.jmx b/samples/client/petstore/jmeter/StoreApi.jmx
index 6c10ea740746..a30bca1219ee 100644
--- a/samples/client/petstore/jmeter/StoreApi.jmx
+++ b/samples/client/petstore/jmeter/StoreApi.jmx
@@ -138,7 +138,7 @@
           
         
         
-          
+          
             ${httpStatusCode}
           
           Assertion.response_code
@@ -213,7 +213,7 @@
           
         
         
-          
+          
             ${httpStatusCode}
           
           Assertion.response_code
@@ -267,7 +267,7 @@
           
           false
           
-          Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+          Find purchase order by ID For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         
         
           
@@ -284,7 +284,7 @@
           
         
         
-          
+          
             ${httpStatusCode}
           
           Assertion.response_code
@@ -360,7 +360,7 @@
           
         
         
-          
+          
             ${httpStatusCode}
           
           Assertion.response_code
diff --git a/samples/client/petstore/jmeter/UserApi.jmx b/samples/client/petstore/jmeter/UserApi.jmx
index fc1ff67ed397..0ab9b304880d 100644
--- a/samples/client/petstore/jmeter/UserApi.jmx
+++ b/samples/client/petstore/jmeter/UserApi.jmx
@@ -163,7 +163,7 @@
           
         
         
-          
+          
             ${httpStatusCode}
           
           Assertion.response_code
@@ -235,7 +235,7 @@
           
         
         
-          
+          
             ${httpStatusCode}
           
           Assertion.response_code
@@ -307,7 +307,7 @@
           
         
         
-          
+          
             ${httpStatusCode}
           
           Assertion.response_code
@@ -374,7 +374,7 @@
           
         
         
-          
+          
             ${httpStatusCode}
           
           Assertion.response_code
@@ -445,7 +445,7 @@
           
         
         
-          
+          
             ${httpStatusCode}
           
           Assertion.response_code
@@ -530,7 +530,7 @@
           
         
         
-          
+          
             ${httpStatusCode}
           
           Assertion.response_code
@@ -597,7 +597,7 @@
           
         
         
-          
+          
             ${httpStatusCode}
           
           Assertion.response_code
@@ -669,7 +669,7 @@
           
         
         
-          
+          
             ${httpStatusCode}
           
           Assertion.response_code
diff --git a/samples/client/petstore/kotlin-array-simple-string-jvm-volley/README.md b/samples/client/petstore/kotlin-array-simple-string-jvm-volley/README.md
index 1180f9c7dff7..ede0c53981f8 100644
--- a/samples/client/petstore/kotlin-array-simple-string-jvm-volley/README.md
+++ b/samples/client/petstore/kotlin-array-simple-string-jvm-volley/README.md
@@ -70,8 +70,8 @@ val requestQueue: Lazy = lazy(initializer = {
 The above constructor for each api allows the following to be customized
 - A custom context, so either a singleton request queue or different scope can be created - see
 https://developer.android.com/training/volley/requestqueue#singleton
-- An overrideable request queue - which in turn can have a custom http url stack passed to it
-- An overrideable request factory constructor call, or a request factory that can be overridden by a custom template, with
+- An overridable request queue - which in turn can have a custom http url stack passed to it
+- An overridable request factory constructor call, or a request factory that can be overridden by a custom template, with
 custom header factory, request post processors and custom gson adapters injected.
 
 #### Overriding request generation
diff --git a/samples/client/petstore/kotlin-array-simple-string-jvm-volley/src/main/kotlin/org/openapitools/client/request/RequestFactory.kt b/samples/client/petstore/kotlin-array-simple-string-jvm-volley/src/main/kotlin/org/openapitools/client/request/RequestFactory.kt
index b32f9ba2f156..02d5979e3721 100644
--- a/samples/client/petstore/kotlin-array-simple-string-jvm-volley/src/main/kotlin/org/openapitools/client/request/RequestFactory.kt
+++ b/samples/client/petstore/kotlin-array-simple-string-jvm-volley/src/main/kotlin/org/openapitools/client/request/RequestFactory.kt
@@ -33,7 +33,7 @@ class RequestFactory(private val headerFactories : List<() -> Map (acc + factory.invoke()).toMutableMap() }
 
             // If we decide to support auth parameters in the url, then you will reference them by supplying a url string
-            // with known variable name refernces in the string. We will then apply
+            // with known variable name references in the string. We will then apply
             val updatedUrl = if (!queryParams.isNullOrEmpty()) {
                 queryParams.asSequence().fold("$url?") {acc, param ->
                 "$acc${escapeString(param.key)}=${escapeString(param.value)}&"
diff --git a/samples/client/petstore/kotlin-default-values-jvm-volley/README.md b/samples/client/petstore/kotlin-default-values-jvm-volley/README.md
index 7f1cf7f1fa6a..749aa7803d9e 100644
--- a/samples/client/petstore/kotlin-default-values-jvm-volley/README.md
+++ b/samples/client/petstore/kotlin-default-values-jvm-volley/README.md
@@ -70,8 +70,8 @@ val requestQueue: Lazy = lazy(initializer = {
 The above constructor for each api allows the following to be customized
 - A custom context, so either a singleton request queue or different scope can be created - see
 https://developer.android.com/training/volley/requestqueue#singleton
-- An overrideable request queue - which in turn can have a custom http url stack passed to it
-- An overrideable request factory constructor call, or a request factory that can be overridden by a custom template, with
+- An overridable request queue - which in turn can have a custom http url stack passed to it
+- An overridable request factory constructor call, or a request factory that can be overridden by a custom template, with
 custom header factory, request post processors and custom gson adapters injected.
 
 #### Overriding request generation
diff --git a/samples/client/petstore/kotlin-default-values-jvm-volley/src/main/kotlin/org/openapitools/client/request/RequestFactory.kt b/samples/client/petstore/kotlin-default-values-jvm-volley/src/main/kotlin/org/openapitools/client/request/RequestFactory.kt
index b32f9ba2f156..02d5979e3721 100644
--- a/samples/client/petstore/kotlin-default-values-jvm-volley/src/main/kotlin/org/openapitools/client/request/RequestFactory.kt
+++ b/samples/client/petstore/kotlin-default-values-jvm-volley/src/main/kotlin/org/openapitools/client/request/RequestFactory.kt
@@ -33,7 +33,7 @@ class RequestFactory(private val headerFactories : List<() -> Map (acc + factory.invoke()).toMutableMap() }
 
             // If we decide to support auth parameters in the url, then you will reference them by supplying a url string
-            // with known variable name refernces in the string. We will then apply
+            // with known variable name references in the string. We will then apply
             val updatedUrl = if (!queryParams.isNullOrEmpty()) {
                 queryParams.asSequence().fold("$url?") {acc, param ->
                 "$acc${escapeString(param.key)}=${escapeString(param.value)}&"
diff --git a/samples/client/petstore/kotlin-gson/docs/StoreApi.md b/samples/client/petstore/kotlin-gson/docs/StoreApi.md
index de2f4dbdcb12..c55032ffa26b 100644
--- a/samples/client/petstore/kotlin-gson/docs/StoreApi.md
+++ b/samples/client/petstore/kotlin-gson/docs/StoreApi.md
@@ -108,7 +108,7 @@ Configure api_key:
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```kotlin
diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index ab07574dd391..78a5eefbab42 100644
--- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -181,7 +181,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @return Order
      * @throws IllegalStateException If the request is not correctly configured
@@ -212,7 +212,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @return ApiResponse
      * @throws IllegalStateException If the request is not correctly configured
diff --git a/samples/client/petstore/kotlin-jackson/docs/StoreApi.md b/samples/client/petstore/kotlin-jackson/docs/StoreApi.md
index de2f4dbdcb12..c55032ffa26b 100644
--- a/samples/client/petstore/kotlin-jackson/docs/StoreApi.md
+++ b/samples/client/petstore/kotlin-jackson/docs/StoreApi.md
@@ -108,7 +108,7 @@ Configure api_key:
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```kotlin
diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index 2e214e45f3bc..c76e8c708a55 100644
--- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -181,7 +181,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @return Order
      * @throws IllegalStateException If the request is not correctly configured
@@ -212,7 +212,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @return ApiResponse
      * @throws IllegalStateException If the request is not correctly configured
diff --git a/samples/client/petstore/kotlin-json-request-string/docs/StoreApi.md b/samples/client/petstore/kotlin-json-request-string/docs/StoreApi.md
index de2f4dbdcb12..c55032ffa26b 100644
--- a/samples/client/petstore/kotlin-json-request-string/docs/StoreApi.md
+++ b/samples/client/petstore/kotlin-json-request-string/docs/StoreApi.md
@@ -108,7 +108,7 @@ Configure api_key:
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```kotlin
diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index 34e2b717f86b..c6cfe5c11799 100644
--- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -182,7 +182,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @return Order
      * @throws IllegalStateException If the request is not correctly configured
@@ -213,7 +213,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @return ApiResponse
      * @throws IllegalStateException If the request is not correctly configured
diff --git a/samples/client/petstore/kotlin-jvm-ktor-gson/docs/StoreApi.md b/samples/client/petstore/kotlin-jvm-ktor-gson/docs/StoreApi.md
index f4986041af8c..bec2f21a2ed8 100644
--- a/samples/client/petstore/kotlin-jvm-ktor-gson/docs/StoreApi.md
+++ b/samples/client/petstore/kotlin-jvm-ktor-gson/docs/StoreApi.md
@@ -108,7 +108,7 @@ Configure api_key:
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```kotlin
diff --git a/samples/client/petstore/kotlin-jvm-ktor-gson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-jvm-ktor-gson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index 8360878da17b..f3f777459518 100644
--- a/samples/client/petstore/kotlin-jvm-ktor-gson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-jvm-ktor-gson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -97,7 +97,7 @@ import java.text.DateFormat
 
         /**
         * Find purchase order by ID
-        * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @param orderId ID of pet that needs to be fetched 
          * @return Order
         */
diff --git a/samples/client/petstore/kotlin-jvm-ktor-jackson/docs/StoreApi.md b/samples/client/petstore/kotlin-jvm-ktor-jackson/docs/StoreApi.md
index f4986041af8c..bec2f21a2ed8 100644
--- a/samples/client/petstore/kotlin-jvm-ktor-jackson/docs/StoreApi.md
+++ b/samples/client/petstore/kotlin-jvm-ktor-jackson/docs/StoreApi.md
@@ -108,7 +108,7 @@ Configure api_key:
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```kotlin
diff --git a/samples/client/petstore/kotlin-jvm-ktor-jackson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-jvm-ktor-jackson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index f6dd67c8b0bb..517a743da149 100644
--- a/samples/client/petstore/kotlin-jvm-ktor-jackson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-jvm-ktor-jackson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -95,7 +95,7 @@ import com.fasterxml.jackson.databind.ObjectMapper
 
         /**
         * Find purchase order by ID
-        * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @param orderId ID of pet that needs to be fetched 
          * @return Order
         */
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/docs/StoreApi.md b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/docs/StoreApi.md
index de2f4dbdcb12..c55032ffa26b 100644
--- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/docs/StoreApi.md
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/docs/StoreApi.md
@@ -108,7 +108,7 @@ Configure api_key:
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```kotlin
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index 4bc01ba9274f..d1f4b7975a34 100644
--- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -183,7 +183,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @return Order
      * @throws IllegalStateException If the request is not correctly configured
@@ -214,7 +214,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @return ApiResponse
      * @throws IllegalStateException If the request is not correctly configured
diff --git a/samples/client/petstore/kotlin-jvm-vertx-gson/docs/StoreApi.md b/samples/client/petstore/kotlin-jvm-vertx-gson/docs/StoreApi.md
index 68fbd1fecf9c..e7398986d04d 100644
--- a/samples/client/petstore/kotlin-jvm-vertx-gson/docs/StoreApi.md
+++ b/samples/client/petstore/kotlin-jvm-vertx-gson/docs/StoreApi.md
@@ -108,7 +108,7 @@ Configure api_key:
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```kotlin
diff --git a/samples/client/petstore/kotlin-jvm-vertx-gson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-jvm-vertx-gson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index 95c239149052..f0d6f11625e7 100644
--- a/samples/client/petstore/kotlin-jvm-vertx-gson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-jvm-vertx-gson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -162,7 +162,7 @@ class StoreApi(basePath: kotlin.String = ApiClient.defaultBasePath, accessToken:
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @return Order
      * @throws IllegalStateException If the request is not correctly configured
@@ -193,7 +193,7 @@ class StoreApi(basePath: kotlin.String = ApiClient.defaultBasePath, accessToken:
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @return ApiResponse
      * @throws IllegalStateException If the request is not correctly configured
diff --git a/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/docs/StoreApi.md b/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/docs/StoreApi.md
index 68fbd1fecf9c..e7398986d04d 100644
--- a/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/docs/StoreApi.md
+++ b/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/docs/StoreApi.md
@@ -108,7 +108,7 @@ Configure api_key:
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```kotlin
diff --git a/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index ed807c37aaec..e13a29f174dd 100644
--- a/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -166,7 +166,7 @@ class StoreApi(basePath: kotlin.String = ApiClient.defaultBasePath, accessToken:
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @return Order
      * @throws IllegalStateException If the request is not correctly configured
@@ -197,7 +197,7 @@ class StoreApi(basePath: kotlin.String = ApiClient.defaultBasePath, accessToken:
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @return ApiResponse
      * @throws IllegalStateException If the request is not correctly configured
diff --git a/samples/client/petstore/kotlin-jvm-vertx-jackson/docs/StoreApi.md b/samples/client/petstore/kotlin-jvm-vertx-jackson/docs/StoreApi.md
index 68fbd1fecf9c..e7398986d04d 100644
--- a/samples/client/petstore/kotlin-jvm-vertx-jackson/docs/StoreApi.md
+++ b/samples/client/petstore/kotlin-jvm-vertx-jackson/docs/StoreApi.md
@@ -108,7 +108,7 @@ Configure api_key:
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```kotlin
diff --git a/samples/client/petstore/kotlin-jvm-vertx-jackson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-jvm-vertx-jackson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index 00640882ecdf..6fed290a6416 100644
--- a/samples/client/petstore/kotlin-jvm-vertx-jackson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-jvm-vertx-jackson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -162,7 +162,7 @@ class StoreApi(basePath: kotlin.String = ApiClient.defaultBasePath, accessToken:
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @return Order
      * @throws IllegalStateException If the request is not correctly configured
@@ -193,7 +193,7 @@ class StoreApi(basePath: kotlin.String = ApiClient.defaultBasePath, accessToken:
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @return ApiResponse
      * @throws IllegalStateException If the request is not correctly configured
diff --git a/samples/client/petstore/kotlin-jvm-vertx-moshi/docs/StoreApi.md b/samples/client/petstore/kotlin-jvm-vertx-moshi/docs/StoreApi.md
index 68fbd1fecf9c..e7398986d04d 100644
--- a/samples/client/petstore/kotlin-jvm-vertx-moshi/docs/StoreApi.md
+++ b/samples/client/petstore/kotlin-jvm-vertx-moshi/docs/StoreApi.md
@@ -108,7 +108,7 @@ Configure api_key:
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```kotlin
diff --git a/samples/client/petstore/kotlin-jvm-vertx-moshi/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-jvm-vertx-moshi/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index 451a1adb48fd..d45b6cde2f73 100644
--- a/samples/client/petstore/kotlin-jvm-vertx-moshi/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-jvm-vertx-moshi/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -161,7 +161,7 @@ class StoreApi(basePath: kotlin.String = ApiClient.defaultBasePath, accessToken:
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @return Order
      * @throws IllegalStateException If the request is not correctly configured
@@ -192,7 +192,7 @@ class StoreApi(basePath: kotlin.String = ApiClient.defaultBasePath, accessToken:
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @return ApiResponse
      * @throws IllegalStateException If the request is not correctly configured
diff --git a/samples/client/petstore/kotlin-jvm-volley/README.md b/samples/client/petstore/kotlin-jvm-volley/README.md
index 9350405a0f57..1f4eeea12ff7 100644
--- a/samples/client/petstore/kotlin-jvm-volley/README.md
+++ b/samples/client/petstore/kotlin-jvm-volley/README.md
@@ -70,8 +70,8 @@ val requestQueue: Lazy = lazy(initializer = {
 The above constructor for each api allows the following to be customized
 - A custom context, so either a singleton request queue or different scope can be created - see
 https://developer.android.com/training/volley/requestqueue#singleton
-- An overrideable request queue - which in turn can have a custom http url stack passed to it
-- An overrideable request factory constructor call, or a request factory that can be overridden by a custom template, with
+- An overridable request queue - which in turn can have a custom http url stack passed to it
+- An overridable request factory constructor call, or a request factory that can be overridden by a custom template, with
 custom header factory, request post processors and custom gson adapters injected.
 
 #### Overriding request generation
diff --git a/samples/client/petstore/kotlin-jvm-volley/docs/StoreApi.md b/samples/client/petstore/kotlin-jvm-volley/docs/StoreApi.md
index 168afd9b9c07..63d7e597b3c6 100644
--- a/samples/client/petstore/kotlin-jvm-volley/docs/StoreApi.md
+++ b/samples/client/petstore/kotlin-jvm-volley/docs/StoreApi.md
@@ -85,7 +85,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```kotlin
diff --git a/samples/client/petstore/kotlin-jvm-volley/src/main/java/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-jvm-volley/src/main/java/org/openapitools/client/apis/StoreApi.kt
index 8c34cfdd291a..104f58992d49 100644
--- a/samples/client/petstore/kotlin-jvm-volley/src/main/java/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-jvm-volley/src/main/java/org/openapitools/client/apis/StoreApi.kt
@@ -156,7 +156,7 @@ class StoreApi (
     }
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @return Order
      */
diff --git a/samples/client/petstore/kotlin-jvm-volley/src/main/java/org/openapitools/client/request/RequestFactory.kt b/samples/client/petstore/kotlin-jvm-volley/src/main/java/org/openapitools/client/request/RequestFactory.kt
index 2bcf9d2d9c6c..09276ebbe3ed 100644
--- a/samples/client/petstore/kotlin-jvm-volley/src/main/java/org/openapitools/client/request/RequestFactory.kt
+++ b/samples/client/petstore/kotlin-jvm-volley/src/main/java/org/openapitools/client/request/RequestFactory.kt
@@ -58,7 +58,7 @@ class RequestFactory(private val headerFactories : List<() -> Map (acc + factory.invoke()).toMutableMap() }
 
             // If we decide to support auth parameters in the url, then you will reference them by supplying a url string
-            // with known variable name refernces in the string. We will then apply
+            // with known variable name references in the string. We will then apply
             val updatedUrl = if (!queryParams.isNullOrEmpty()) {
                 queryParams.asSequence().fold("$url?") {acc, param ->
                 "$acc${escapeString(param.key)}=${escapeString(param.value)}&"
diff --git a/samples/client/petstore/kotlin-modelMutable/docs/StoreApi.md b/samples/client/petstore/kotlin-modelMutable/docs/StoreApi.md
index 0a3793c214b4..7edeaf16398c 100644
--- a/samples/client/petstore/kotlin-modelMutable/docs/StoreApi.md
+++ b/samples/client/petstore/kotlin-modelMutable/docs/StoreApi.md
@@ -108,7 +108,7 @@ Configure api_key:
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```kotlin
diff --git a/samples/client/petstore/kotlin-modelMutable/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-modelMutable/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index 20bc7f914cee..49220c8b4dd2 100644
--- a/samples/client/petstore/kotlin-modelMutable/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-modelMutable/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -181,7 +181,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @return Order
      * @throws IllegalStateException If the request is not correctly configured
@@ -212,7 +212,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @return ApiResponse
      * @throws IllegalStateException If the request is not correctly configured
diff --git a/samples/client/petstore/kotlin-moshi-codegen/docs/StoreApi.md b/samples/client/petstore/kotlin-moshi-codegen/docs/StoreApi.md
index de2f4dbdcb12..c55032ffa26b 100644
--- a/samples/client/petstore/kotlin-moshi-codegen/docs/StoreApi.md
+++ b/samples/client/petstore/kotlin-moshi-codegen/docs/StoreApi.md
@@ -108,7 +108,7 @@ Configure api_key:
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```kotlin
diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index ca473d06dff8..2184157a2ed0 100644
--- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -181,7 +181,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @return Order
      * @throws IllegalStateException If the request is not correctly configured
@@ -212,7 +212,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @return ApiResponse
      * @throws IllegalStateException If the request is not correctly configured
diff --git a/samples/client/petstore/kotlin-multiplatform/docs/StoreApi.md b/samples/client/petstore/kotlin-multiplatform/docs/StoreApi.md
index f4986041af8c..bec2f21a2ed8 100644
--- a/samples/client/petstore/kotlin-multiplatform/docs/StoreApi.md
+++ b/samples/client/petstore/kotlin-multiplatform/docs/StoreApi.md
@@ -108,7 +108,7 @@ Configure api_key:
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```kotlin
diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt
index c335f9512e0b..58e6c87ca54f 100644
--- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -108,7 +108,7 @@ open class StoreApi(
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @return Order
      */
diff --git a/samples/client/petstore/kotlin-nonpublic/docs/StoreApi.md b/samples/client/petstore/kotlin-nonpublic/docs/StoreApi.md
index de2f4dbdcb12..c55032ffa26b 100644
--- a/samples/client/petstore/kotlin-nonpublic/docs/StoreApi.md
+++ b/samples/client/petstore/kotlin-nonpublic/docs/StoreApi.md
@@ -108,7 +108,7 @@ Configure api_key:
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```kotlin
diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index c99fd97c6ee5..4efeb8f355ca 100644
--- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -181,7 +181,7 @@ internal class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHtt
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @return Order
      * @throws IllegalStateException If the request is not correctly configured
@@ -212,7 +212,7 @@ internal class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHtt
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @return ApiResponse
      * @throws IllegalStateException If the request is not correctly configured
diff --git a/samples/client/petstore/kotlin-nullable/docs/StoreApi.md b/samples/client/petstore/kotlin-nullable/docs/StoreApi.md
index 30a28531120a..f11c3b6ea165 100644
--- a/samples/client/petstore/kotlin-nullable/docs/StoreApi.md
+++ b/samples/client/petstore/kotlin-nullable/docs/StoreApi.md
@@ -108,7 +108,7 @@ Configure api_key:
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```kotlin
diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index 4ecada339c1e..c25915eaa6fd 100644
--- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -181,7 +181,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @return Order or null
      * @throws IllegalStateException If the request is not correctly configured
@@ -212,7 +212,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @return ApiResponse
      * @throws IllegalStateException If the request is not correctly configured
diff --git a/samples/client/petstore/kotlin-okhttp3/docs/StoreApi.md b/samples/client/petstore/kotlin-okhttp3/docs/StoreApi.md
index de2f4dbdcb12..c55032ffa26b 100644
--- a/samples/client/petstore/kotlin-okhttp3/docs/StoreApi.md
+++ b/samples/client/petstore/kotlin-okhttp3/docs/StoreApi.md
@@ -108,7 +108,7 @@ Configure api_key:
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```kotlin
diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index a99b9d3da251..8474d8e3459f 100644
--- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -181,7 +181,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @return Order
      * @throws IllegalStateException If the request is not correctly configured
@@ -212,7 +212,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @return ApiResponse
      * @throws IllegalStateException If the request is not correctly configured
diff --git a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/docs/StoreApi.md b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/docs/StoreApi.md
index d3ca3e358965..78688cd5f19a 100644
--- a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/docs/StoreApi.md
+++ b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/docs/StoreApi.md
@@ -85,7 +85,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```kotlin
diff --git a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index 393e0c10e36d..2c1e446469c8 100644
--- a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -36,7 +36,7 @@ interface StoreApi {
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Responses:
      *  - 200: successful operation
      *  - 400: Invalid ID supplied
diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/docs/StoreApi.md b/samples/client/petstore/kotlin-retrofit2-rx3/docs/StoreApi.md
index d3ca3e358965..78688cd5f19a 100644
--- a/samples/client/petstore/kotlin-retrofit2-rx3/docs/StoreApi.md
+++ b/samples/client/petstore/kotlin-retrofit2-rx3/docs/StoreApi.md
@@ -85,7 +85,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```kotlin
diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index b24d72895e69..8b69aecb9c98 100644
--- a/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -36,7 +36,7 @@ interface StoreApi {
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Responses:
      *  - 200: successful operation
      *  - 400: Invalid ID supplied
diff --git a/samples/client/petstore/kotlin-retrofit2/docs/StoreApi.md b/samples/client/petstore/kotlin-retrofit2/docs/StoreApi.md
index d3ca3e358965..78688cd5f19a 100644
--- a/samples/client/petstore/kotlin-retrofit2/docs/StoreApi.md
+++ b/samples/client/petstore/kotlin-retrofit2/docs/StoreApi.md
@@ -85,7 +85,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```kotlin
diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index 5a3c2f7ccb8f..e72a0903beaf 100644
--- a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -35,7 +35,7 @@ interface StoreApi {
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Responses:
      *  - 200: successful operation
      *  - 400: Invalid ID supplied
diff --git a/samples/client/petstore/kotlin-string/docs/StoreApi.md b/samples/client/petstore/kotlin-string/docs/StoreApi.md
index de2f4dbdcb12..c55032ffa26b 100644
--- a/samples/client/petstore/kotlin-string/docs/StoreApi.md
+++ b/samples/client/petstore/kotlin-string/docs/StoreApi.md
@@ -108,7 +108,7 @@ Configure api_key:
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```kotlin
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index ca473d06dff8..2184157a2ed0 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -181,7 +181,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @return Order
      * @throws IllegalStateException If the request is not correctly configured
@@ -212,7 +212,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @return ApiResponse
      * @throws IllegalStateException If the request is not correctly configured
diff --git a/samples/client/petstore/kotlin-threetenbp/docs/StoreApi.md b/samples/client/petstore/kotlin-threetenbp/docs/StoreApi.md
index de2f4dbdcb12..c55032ffa26b 100644
--- a/samples/client/petstore/kotlin-threetenbp/docs/StoreApi.md
+++ b/samples/client/petstore/kotlin-threetenbp/docs/StoreApi.md
@@ -108,7 +108,7 @@ Configure api_key:
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```kotlin
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index ca473d06dff8..2184157a2ed0 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -181,7 +181,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @return Order
      * @throws IllegalStateException If the request is not correctly configured
@@ -212,7 +212,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @return ApiResponse
      * @throws IllegalStateException If the request is not correctly configured
diff --git a/samples/client/petstore/kotlin/docs/StoreApi.md b/samples/client/petstore/kotlin/docs/StoreApi.md
index de2f4dbdcb12..c55032ffa26b 100644
--- a/samples/client/petstore/kotlin/docs/StoreApi.md
+++ b/samples/client/petstore/kotlin/docs/StoreApi.md
@@ -108,7 +108,7 @@ Configure api_key:
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```kotlin
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index ca473d06dff8..2184157a2ed0 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -181,7 +181,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @return Order
      * @throws IllegalStateException If the request is not correctly configured
@@ -212,7 +212,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @return ApiResponse
      * @throws IllegalStateException If the request is not correctly configured
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGStoreApi.h b/samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGStoreApi.h
index e67aa3c83572..935845f72151 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGStoreApi.h
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGStoreApi.h
@@ -48,7 +48,7 @@ extern NSInteger kSWGStoreApiMissingParamErrorCode;
 
 
 /// Find purchase order by ID
-/// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+/// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 ///
 /// @param orderId ID of pet that needs to be fetched
 /// 
diff --git a/samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGStoreApi.m b/samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGStoreApi.m
index eaf254a6ab3e..14a5c4239217 100644
--- a/samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGStoreApi.m
+++ b/samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGStoreApi.m
@@ -171,7 +171,7 @@ -(NSURLSessionTask*) getInventoryWithCompletionHandler:
 
 ///
 /// Find purchase order by ID
-/// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+/// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 ///  @param orderId ID of pet that needs to be fetched 
 ///
 ///  @returns SWGOrder*
diff --git a/samples/client/petstore/objc/core-data/docs/SWGStoreApi.md b/samples/client/petstore/objc/core-data/docs/SWGStoreApi.md
index 17a3c97e8f53..3c13b68eaff6 100644
--- a/samples/client/petstore/objc/core-data/docs/SWGStoreApi.md
+++ b/samples/client/petstore/objc/core-data/docs/SWGStoreApi.md
@@ -118,7 +118,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```objc
diff --git a/samples/client/petstore/objc/default/SwaggerClient/Api/SWGStoreApi.h b/samples/client/petstore/objc/default/SwaggerClient/Api/SWGStoreApi.h
index e67aa3c83572..935845f72151 100644
--- a/samples/client/petstore/objc/default/SwaggerClient/Api/SWGStoreApi.h
+++ b/samples/client/petstore/objc/default/SwaggerClient/Api/SWGStoreApi.h
@@ -48,7 +48,7 @@ extern NSInteger kSWGStoreApiMissingParamErrorCode;
 
 
 /// Find purchase order by ID
-/// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+/// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 ///
 /// @param orderId ID of pet that needs to be fetched
 /// 
diff --git a/samples/client/petstore/objc/default/SwaggerClient/Api/SWGStoreApi.m b/samples/client/petstore/objc/default/SwaggerClient/Api/SWGStoreApi.m
index eaf254a6ab3e..14a5c4239217 100644
--- a/samples/client/petstore/objc/default/SwaggerClient/Api/SWGStoreApi.m
+++ b/samples/client/petstore/objc/default/SwaggerClient/Api/SWGStoreApi.m
@@ -171,7 +171,7 @@ -(NSURLSessionTask*) getInventoryWithCompletionHandler:
 
 ///
 /// Find purchase order by ID
-/// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+/// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 ///  @param orderId ID of pet that needs to be fetched 
 ///
 ///  @returns SWGOrder*
diff --git a/samples/client/petstore/objc/default/docs/SWGStoreApi.md b/samples/client/petstore/objc/default/docs/SWGStoreApi.md
index 17a3c97e8f53..3c13b68eaff6 100644
--- a/samples/client/petstore/objc/default/docs/SWGStoreApi.md
+++ b/samples/client/petstore/objc/default/docs/SWGStoreApi.md
@@ -118,7 +118,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```objc
diff --git a/samples/client/petstore/perl/docs/StoreApi.md b/samples/client/petstore/perl/docs/StoreApi.md
index 594112b6390f..f772b1020c08 100644
--- a/samples/client/petstore/perl/docs/StoreApi.md
+++ b/samples/client/petstore/perl/docs/StoreApi.md
@@ -112,7 +112,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```perl
diff --git a/samples/client/petstore/perl/tests/01_pet_api.t b/samples/client/petstore/perl/tests/01_pet_api.t
index e9647a96a396..efd67b08f349 100644
--- a/samples/client/petstore/perl/tests/01_pet_api.t
+++ b/samples/client/petstore/perl/tests/01_pet_api.t
@@ -66,7 +66,7 @@ is $get_pet_hash->{photoUrls}->[1], 'oop', 'get the proper photoUrl from get_pet
 
 
 my $update_pet_with_form = $api->update_pet_with_form(pet_id => $pet_id, name => 'test_name', status => 'sold');
-is $update_pet_with_form, undef, 'get the null response from update_pet_wth_form';
+is $update_pet_with_form, undef, 'get the null response from update_pet_with_form';
 
 my $get_pet_after_update = $api->get_pet_by_id(pet_id => $pet_id);
 is $get_pet_after_update->{status}, 'sold', 'get the updated status after update_pet_with_form';
diff --git a/samples/client/petstore/perl/tests/04_role.t b/samples/client/petstore/perl/tests/04_role.t
index 6cd994dd5b3d..b39d17779bc4 100644
--- a/samples/client/petstore/perl/tests/04_role.t
+++ b/samples/client/petstore/perl/tests/04_role.t
@@ -135,7 +135,7 @@ my $cleared_tokens_cmp = {
         };
 cmp_deeply( $api->_cfg->clear_tokens, $cleared_tokens_cmp, 'clear_tokens() returns the correct data structure' );
 
-my $bad_token = { bad_token_name => 'bad token value' }; # value should should be hashref
+my $bad_token = { bad_token_name => 'bad token value' }; # value should be hashref
 dies_ok { $api->_cfg->accept_tokens($bad_token) } "bad token causes exception";
 
 
diff --git a/samples/client/petstore/perl/tests/05_long_module_name.t b/samples/client/petstore/perl/tests/05_long_module_name.t
index 2be4ecbca0a7..7c4cb5eea3ee 100644
--- a/samples/client/petstore/perl/tests/05_long_module_name.t
+++ b/samples/client/petstore/perl/tests/05_long_module_name.t
@@ -77,7 +77,7 @@ is $get_pet_hash->{photoUrls}->[1], 'oop', 'get the proper photoUrl from get_pet
 
 
 my $update_pet_with_form = $api->update_pet_with_form(pet_id => $pet_id, name => 'test_name', status => 'sold');
-is $update_pet_with_form, undef, 'get the null response from update_pet_wth_form';
+is $update_pet_with_form, undef, 'get the null response from update_pet_with_form';
 
 my $get_pet_after_update = $api->get_pet_by_id(pet_id => $pet_id);
 is $get_pet_after_update->{status}, 'sold', 'get the updated status after update_pet_with_form';
diff --git a/samples/client/petstore/perl/tests/06_inheritance.t b/samples/client/petstore/perl/tests/06_inheritance.t
index cdf089ea64e8..5f9d5e76ae1e 100644
--- a/samples/client/petstore/perl/tests/06_inheritance.t
+++ b/samples/client/petstore/perl/tests/06_inheritance.t
@@ -45,7 +45,7 @@ isa_ok($human, 'WWW::OpenAPIClient::Object::Human');
 #
 #
 #my $update_pet_with_form = $api->update_pet_with_form(pet_id => $pet_id, name => 'test_name', status => 'sold');
-#is $update_pet_with_form, undef, 'get the null response from update_pet_wth_form';
+#is $update_pet_with_form, undef, 'get the null response from update_pet_with_form';
 #
 #my $get_pet_after_update = $api->get_pet_by_id(pet_id => $pet_id);
 #is $get_pet_after_update->{status}, 'sold', 'get the updated status after update_pet_with_form';
diff --git a/samples/client/petstore/php/OpenAPIClient-php/docs/Api/StoreApi.md b/samples/client/petstore/php/OpenAPIClient-php/docs/Api/StoreApi.md
index 9e88ae63e314..f704ceffbdf4 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/docs/Api/StoreApi.md
+++ b/samples/client/petstore/php/OpenAPIClient-php/docs/Api/StoreApi.md
@@ -132,7 +132,7 @@ getOrderById($order_id): \OpenAPI\Client\Model\Order
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php b/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
index 0dd7232b1b42..3a89b91a6dfe 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
@@ -445,7 +445,7 @@ public static function deserialize($data, $class, $httpHeaders = null)
         }
 
         if ($class === '\DateTime') {
-            // Some API's return an invalid, empty string as a
+            // Some APIs return an invalid, empty string as a
             // date-time property. DateTime::__construct() will return
             // the current time for empty input which is probably not
             // what is meant. The invalid empty string is probably to
@@ -455,7 +455,7 @@ public static function deserialize($data, $class, $httpHeaders = null)
                 try {
                     return new \DateTime($data);
                 } catch (\Exception $exception) {
-                    // Some API's return a date-time with too high nanosecond
+                    // Some APIs return a date-time with too high nanosecond
                     // precision for php's DateTime to handle.
                     // With provided regexp 6 digits of microseconds saved
                     return new \DateTime(self::sanitizeTimestamp($data));
diff --git a/samples/client/petstore/php/OpenAPIClient-php/tests/DateTimeSerializerTest.php b/samples/client/petstore/php/OpenAPIClient-php/tests/DateTimeSerializerTest.php
index 8e40101c840f..78547afd2f4c 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/tests/DateTimeSerializerTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/DateTimeSerializerTest.php
@@ -7,7 +7,7 @@
 
 class DateTimeSerializerTest extends TestCase
 {
-    public function testDateTimeSanitazion()
+    public function testDateTimeSanitation()
     {
         $dateTime = new \DateTime('April 30, 1973 17:05 CEST');
 
@@ -25,7 +25,7 @@ public function testDateTimeSanitazion()
         ObjectSerializer::setDateTimeFormat(\DateTime::ATOM);
     }
 
-    public function testDateSanitazion()
+    public function testDateSanitation()
     {
         $dateTime = new \DateTime('April 30, 1973 17:05 CEST');
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/tests/OrderApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/tests/OrderApiTest.php
index 6769d913f22b..78cc9d3edf79 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/tests/OrderApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/tests/OrderApiTest.php
@@ -40,7 +40,7 @@ public function testOrderException()
         $order->setStatus("invalid_value");
     }
 
-    // test deseralization of order
+    // test deserialization of order
     public function testDeserializationOfOrder()
     {
         $order_json = <<assertSame(false, $order->getComplete());
     }
   
-    // test deseralization of array of array of order
+    // test deserialization of array of array of order
     public function testDeserializationOfArrayOfArrayOfOrder()
     {
         $order_json = <<assertSame(false, $_order->getComplete());
     }
 
-    // test deseralization of map of map of order
+    // test deserialization of map of map of order
     public function testDeserializationOfMapOfMapOfOrder()
     {
         $order_json = << 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```powershell
diff --git a/samples/client/petstore/powershell/src/PSPetstore/Private/PSHttpSignatureAuth.ps1 b/samples/client/petstore/powershell/src/PSPetstore/Private/PSHttpSignatureAuth.ps1
index 1b2b77175905..1fbc24685180 100644
--- a/samples/client/petstore/powershell/src/PSPetstore/Private/PSHttpSignatureAuth.ps1
+++ b/samples/client/petstore/powershell/src/PSPetstore/Private/PSHttpSignatureAuth.ps1
@@ -118,7 +118,7 @@ function Get-PSHttpSignedHeader {
             -HashAlgorithmName $httpSigningConfiguration.HashAlgorithm `
             -KeyPassPhrase $httpSigningConfiguration.KeyPassPhrase
     }
-    #Depricated
+    #Deprecated
     <#$cryptographicScheme = Get-PSCryptographicScheme -SigningAlgorithm $httpSigningConfiguration.SigningAlgorithm `
                                                  -HashAlgorithm $httpSigningConfiguration.HashAlgorithm
     #>
diff --git a/samples/client/petstore/powershell/tests/Petstore.Tests.ps1 b/samples/client/petstore/powershell/tests/Petstore.Tests.ps1
index b528ea675fca..6e64665dd659 100644
--- a/samples/client/petstore/powershell/tests/Petstore.Tests.ps1
+++ b/samples/client/petstore/powershell/tests/Petstore.Tests.ps1
@@ -60,7 +60,7 @@ Describe -tag 'PSOpenAPITools' -name 'Integration Tests' {
             $Result = Update-PSPet -Pet $NewPet
             $Result = Get-PSPetById -petId $Id -WithHttpInfo
             $Result.GetType().fullname | Should -Be "System.Collections.Hashtable"
-            #$Result["Response"].GetType().fullanme | Should -Be "System.Management.Automation.PSCustomObject"
+            #$Result["Response"].GetType().fullname | Should -Be "System.Management.Automation.PSCustomObject"
             $Result["Response"]."id" | Should -Be 38369
             $Result["Response"]."name" | Should -Be "PowerShell2"
             $Result["Response"]."status" | Should -Be "Sold"
diff --git a/samples/client/petstore/python-asyncio/docs/FakeApi.md b/samples/client/petstore/python-asyncio/docs/FakeApi.md
index 34ffb41ad8d0..93ddfecf9697 100644
--- a/samples/client/petstore/python-asyncio/docs/FakeApi.md
+++ b/samples/client/petstore/python-asyncio/docs/FakeApi.md
@@ -749,7 +749,7 @@ No authorization required
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-**400** | Someting wrong |  -  |
+**400** | Something wrong |  -  |
 
 [[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)
 
diff --git a/samples/client/petstore/python-asyncio/docs/StoreApi.md b/samples/client/petstore/python-asyncio/docs/StoreApi.md
index b9dc71c38f55..169d70741638 100644
--- a/samples/client/petstore/python-asyncio/docs/StoreApi.md
+++ b/samples/client/petstore/python-asyncio/docs/StoreApi.md
@@ -146,7 +146,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/api/store_api.py b/samples/client/petstore/python-asyncio/petstore_api/api/store_api.py
index 4fa17d350ebf..cbc91a0fc92c 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/api/store_api.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/api/store_api.py
@@ -297,7 +297,7 @@ def get_inventory_with_http_info(self, **kwargs):  # noqa: E501
     def get_order_by_id(self, order_id, **kwargs):  # noqa: E501
         """Find purchase order by ID  # noqa: E501
 
-        For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions  # noqa: E501
+        For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
 
@@ -327,7 +327,7 @@ def get_order_by_id(self, order_id, **kwargs):  # noqa: E501
     def get_order_by_id_with_http_info(self, order_id, **kwargs):  # noqa: E501
         """Find purchase order by ID  # noqa: E501
 
-        For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions  # noqa: E501
+        For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
 
diff --git a/samples/client/petstore/python-legacy/docs/FakeApi.md b/samples/client/petstore/python-legacy/docs/FakeApi.md
index 34ffb41ad8d0..93ddfecf9697 100644
--- a/samples/client/petstore/python-legacy/docs/FakeApi.md
+++ b/samples/client/petstore/python-legacy/docs/FakeApi.md
@@ -749,7 +749,7 @@ No authorization required
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-**400** | Someting wrong |  -  |
+**400** | Something wrong |  -  |
 
 [[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)
 
diff --git a/samples/client/petstore/python-legacy/docs/StoreApi.md b/samples/client/petstore/python-legacy/docs/StoreApi.md
index b9dc71c38f55..169d70741638 100644
--- a/samples/client/petstore/python-legacy/docs/StoreApi.md
+++ b/samples/client/petstore/python-legacy/docs/StoreApi.md
@@ -146,7 +146,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/python-legacy/petstore_api/api/store_api.py b/samples/client/petstore/python-legacy/petstore_api/api/store_api.py
index 4fa17d350ebf..cbc91a0fc92c 100644
--- a/samples/client/petstore/python-legacy/petstore_api/api/store_api.py
+++ b/samples/client/petstore/python-legacy/petstore_api/api/store_api.py
@@ -297,7 +297,7 @@ def get_inventory_with_http_info(self, **kwargs):  # noqa: E501
     def get_order_by_id(self, order_id, **kwargs):  # noqa: E501
         """Find purchase order by ID  # noqa: E501
 
-        For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions  # noqa: E501
+        For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
 
@@ -327,7 +327,7 @@ def get_order_by_id(self, order_id, **kwargs):  # noqa: E501
     def get_order_by_id_with_http_info(self, order_id, **kwargs):  # noqa: E501
         """Find purchase order by ID  # noqa: E501
 
-        For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions  # noqa: E501
+        For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
 
diff --git a/samples/client/petstore/python-prior/docs/FakeApi.md b/samples/client/petstore/python-prior/docs/FakeApi.md
index 7c12e3bd188d..cef1d93c186a 100644
--- a/samples/client/petstore/python-prior/docs/FakeApi.md
+++ b/samples/client/petstore/python-prior/docs/FakeApi.md
@@ -1103,7 +1103,7 @@ No authorization required
 
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-**400** | Someting wrong |  -  |
+**400** | Something wrong |  -  |
 
 [[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)
 
diff --git a/samples/client/petstore/python-prior/docs/StoreApi.md b/samples/client/petstore/python-prior/docs/StoreApi.md
index d2e7f8a925b8..95a40cf27acd 100644
--- a/samples/client/petstore/python-prior/docs/StoreApi.md
+++ b/samples/client/petstore/python-prior/docs/StoreApi.md
@@ -154,7 +154,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/python-prior/petstore_api/api/store_api.py b/samples/client/petstore/python-prior/petstore_api/api/store_api.py
index 98e47ccdf869..d171adfb3a06 100644
--- a/samples/client/petstore/python-prior/petstore_api/api/store_api.py
+++ b/samples/client/petstore/python-prior/petstore_api/api/store_api.py
@@ -400,7 +400,7 @@ def get_order_by_id(
     ):
         """Find purchase order by ID  # noqa: E501
 
-        For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions  # noqa: E501
+        For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
 
diff --git a/samples/client/petstore/python-prior/petstore_api/models/__init__.py b/samples/client/petstore/python-prior/petstore_api/models/__init__.py
index 06a63ac193e1..2fd471f464e0 100644
--- a/samples/client/petstore/python-prior/petstore_api/models/__init__.py
+++ b/samples/client/petstore/python-prior/petstore_api/models/__init__.py
@@ -4,7 +4,7 @@
 # if you have many models here with many references from one model to another this may
 # raise a RecursionError
 # to avoid this, import only the models that you directly need like:
-# from from petstore_api.model.pet import Pet
+# from petstore_api.model.pet import Pet
 # or import this package, but before doing it, use:
 # import sys
 # sys.setrecursionlimit(n)
diff --git a/samples/client/petstore/python-prior/tests/test_api_client.py b/samples/client/petstore/python-prior/tests/test_api_client.py
index 5142a14e0dbb..5a4e36035bfe 100644
--- a/samples/client/petstore/python-prior/tests/test_api_client.py
+++ b/samples/client/petstore/python-prior/tests/test_api_client.py
@@ -210,7 +210,7 @@ def test_sanitize_for_serialization(self):
         result = self.api_client.sanitize_for_serialization(data)
         self.assertEqual(result, list_of_pet_dict)
 
-        # model with additional proerties
+        # model with additional properties
         model_dict = {'some_key': True}
         model = StringBooleanMap(**model_dict)
         result = self.api_client.sanitize_for_serialization(model)
diff --git a/samples/client/petstore/python-prior_disallowAdditionalPropertiesIfNotPresent/docs/FakeApi.md b/samples/client/petstore/python-prior_disallowAdditionalPropertiesIfNotPresent/docs/FakeApi.md
index 7c12e3bd188d..cef1d93c186a 100644
--- a/samples/client/petstore/python-prior_disallowAdditionalPropertiesIfNotPresent/docs/FakeApi.md
+++ b/samples/client/petstore/python-prior_disallowAdditionalPropertiesIfNotPresent/docs/FakeApi.md
@@ -1103,7 +1103,7 @@ No authorization required
 
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-**400** | Someting wrong |  -  |
+**400** | Something wrong |  -  |
 
 [[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)
 
diff --git a/samples/client/petstore/python-prior_disallowAdditionalPropertiesIfNotPresent/docs/StoreApi.md b/samples/client/petstore/python-prior_disallowAdditionalPropertiesIfNotPresent/docs/StoreApi.md
index d2e7f8a925b8..95a40cf27acd 100644
--- a/samples/client/petstore/python-prior_disallowAdditionalPropertiesIfNotPresent/docs/StoreApi.md
+++ b/samples/client/petstore/python-prior_disallowAdditionalPropertiesIfNotPresent/docs/StoreApi.md
@@ -154,7 +154,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/python-prior_disallowAdditionalPropertiesIfNotPresent/petstore_api/api/store_api.py b/samples/client/petstore/python-prior_disallowAdditionalPropertiesIfNotPresent/petstore_api/api/store_api.py
index 98e47ccdf869..d171adfb3a06 100644
--- a/samples/client/petstore/python-prior_disallowAdditionalPropertiesIfNotPresent/petstore_api/api/store_api.py
+++ b/samples/client/petstore/python-prior_disallowAdditionalPropertiesIfNotPresent/petstore_api/api/store_api.py
@@ -400,7 +400,7 @@ def get_order_by_id(
     ):
         """Find purchase order by ID  # noqa: E501
 
-        For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions  # noqa: E501
+        For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
 
diff --git a/samples/client/petstore/python-prior_disallowAdditionalPropertiesIfNotPresent/petstore_api/models/__init__.py b/samples/client/petstore/python-prior_disallowAdditionalPropertiesIfNotPresent/petstore_api/models/__init__.py
index 06a63ac193e1..2fd471f464e0 100644
--- a/samples/client/petstore/python-prior_disallowAdditionalPropertiesIfNotPresent/petstore_api/models/__init__.py
+++ b/samples/client/petstore/python-prior_disallowAdditionalPropertiesIfNotPresent/petstore_api/models/__init__.py
@@ -4,7 +4,7 @@
 # if you have many models here with many references from one model to another this may
 # raise a RecursionError
 # to avoid this, import only the models that you directly need like:
-# from from petstore_api.model.pet import Pet
+# from petstore_api.model.pet import Pet
 # or import this package, but before doing it, use:
 # import sys
 # sys.setrecursionlimit(n)
diff --git a/samples/client/petstore/python-prior_disallowAdditionalPropertiesIfNotPresent/tests/test_api_client.py b/samples/client/petstore/python-prior_disallowAdditionalPropertiesIfNotPresent/tests/test_api_client.py
index f808905993c4..c2d8f20f2ad5 100644
--- a/samples/client/petstore/python-prior_disallowAdditionalPropertiesIfNotPresent/tests/test_api_client.py
+++ b/samples/client/petstore/python-prior_disallowAdditionalPropertiesIfNotPresent/tests/test_api_client.py
@@ -200,7 +200,7 @@ def test_sanitize_for_serialization(self):
         result = self.api_client.sanitize_for_serialization(data)
         self.assertEqual(result, list_of_pet_dict)
 
-        # model with additional proerties
+        # model with additional properties
         model_dict = {'some_key': True}
         model = StringBooleanMap(**model_dict)
         result = self.api_client.sanitize_for_serialization(model)
diff --git a/samples/client/petstore/python-tornado/docs/FakeApi.md b/samples/client/petstore/python-tornado/docs/FakeApi.md
index 34ffb41ad8d0..93ddfecf9697 100644
--- a/samples/client/petstore/python-tornado/docs/FakeApi.md
+++ b/samples/client/petstore/python-tornado/docs/FakeApi.md
@@ -749,7 +749,7 @@ No authorization required
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-**400** | Someting wrong |  -  |
+**400** | Something wrong |  -  |
 
 [[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)
 
diff --git a/samples/client/petstore/python-tornado/docs/StoreApi.md b/samples/client/petstore/python-tornado/docs/StoreApi.md
index b9dc71c38f55..169d70741638 100644
--- a/samples/client/petstore/python-tornado/docs/StoreApi.md
+++ b/samples/client/petstore/python-tornado/docs/StoreApi.md
@@ -146,7 +146,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/python-tornado/petstore_api/api/store_api.py b/samples/client/petstore/python-tornado/petstore_api/api/store_api.py
index 4fa17d350ebf..cbc91a0fc92c 100644
--- a/samples/client/petstore/python-tornado/petstore_api/api/store_api.py
+++ b/samples/client/petstore/python-tornado/petstore_api/api/store_api.py
@@ -297,7 +297,7 @@ def get_inventory_with_http_info(self, **kwargs):  # noqa: E501
     def get_order_by_id(self, order_id, **kwargs):  # noqa: E501
         """Find purchase order by ID  # noqa: E501
 
-        For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions  # noqa: E501
+        For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
 
@@ -327,7 +327,7 @@ def get_order_by_id(self, order_id, **kwargs):  # noqa: E501
     def get_order_by_id_with_http_info(self, order_id, **kwargs):  # noqa: E501
         """Find purchase order by ID  # noqa: E501
 
-        For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions  # noqa: E501
+        For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
 
diff --git a/samples/client/petstore/ruby-autoload/docs/StoreApi.md b/samples/client/petstore/ruby-autoload/docs/StoreApi.md
index 0bccca0bec7e..52c551498cf0 100644
--- a/samples/client/petstore/ruby-autoload/docs/StoreApi.md
+++ b/samples/client/petstore/ruby-autoload/docs/StoreApi.md
@@ -147,7 +147,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Examples
 
diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/api/store_api.rb b/samples/client/petstore/ruby-autoload/lib/petstore/api/store_api.rb
index 5b9bc0fea9eb..8cd9e4bf4efd 100644
--- a/samples/client/petstore/ruby-autoload/lib/petstore/api/store_api.rb
+++ b/samples/client/petstore/ruby-autoload/lib/petstore/api/store_api.rb
@@ -138,7 +138,7 @@ def get_inventory_with_http_info(opts = {})
     end
 
     # Find purchase order by ID
-    # For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    # For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
     # @param order_id [Integer] ID of pet that needs to be fetched
     # @param [Hash] opts the optional parameters
     # @return [Order]
@@ -148,7 +148,7 @@ def get_order_by_id(order_id, opts = {})
     end
 
     # Find purchase order by ID
-    # For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    # For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
     # @param order_id [Integer] ID of pet that needs to be fetched
     # @param [Hash] opts the optional parameters
     # @return [Array<(Order, Integer, Hash)>] Order data, response status code and response headers
diff --git a/samples/client/petstore/ruby-autoload/spec/api/store_api_spec.rb b/samples/client/petstore/ruby-autoload/spec/api/store_api_spec.rb
index 165cc7a2b9ff..bc9e4b294cee 100644
--- a/samples/client/petstore/ruby-autoload/spec/api/store_api_spec.rb
+++ b/samples/client/petstore/ruby-autoload/spec/api/store_api_spec.rb
@@ -57,7 +57,7 @@
 
   # unit tests for get_order_by_id
   # Find purchase order by ID
-  # For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+  # For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
   # @param order_id ID of pet that needs to be fetched
   # @param [Hash] opts the optional parameters
   # @return [Order]
diff --git a/samples/client/petstore/ruby-faraday/docs/StoreApi.md b/samples/client/petstore/ruby-faraday/docs/StoreApi.md
index 0bccca0bec7e..52c551498cf0 100644
--- a/samples/client/petstore/ruby-faraday/docs/StoreApi.md
+++ b/samples/client/petstore/ruby-faraday/docs/StoreApi.md
@@ -147,7 +147,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Examples
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/store_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/store_api.rb
index 9b1e5d8d933b..4fc85638c812 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/api/store_api.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/store_api.rb
@@ -138,7 +138,7 @@ def get_inventory_with_http_info(opts = {})
     end
 
     # Find purchase order by ID
-    # For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    # For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
     # @param order_id [Integer] ID of pet that needs to be fetched
     # @param [Hash] opts the optional parameters
     # @return [Order]
@@ -148,7 +148,7 @@ def get_order_by_id(order_id, opts = {})
     end
 
     # Find purchase order by ID
-    # For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    # For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
     # @param order_id [Integer] ID of pet that needs to be fetched
     # @param [Hash] opts the optional parameters
     # @return [Array<(Order, Integer, Hash)>] Order data, response status code and response headers
diff --git a/samples/client/petstore/ruby-faraday/spec/api/store_api_spec.rb b/samples/client/petstore/ruby-faraday/spec/api/store_api_spec.rb
index 1fd9faf40aaf..97c3d704de00 100644
--- a/samples/client/petstore/ruby-faraday/spec/api/store_api_spec.rb
+++ b/samples/client/petstore/ruby-faraday/spec/api/store_api_spec.rb
@@ -57,7 +57,7 @@
 
   # unit tests for get_order_by_id
   # Find purchase order by ID
-  # For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+  # For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
   # @param order_id ID of pet that needs to be fetched
   # @param [Hash] opts the optional parameters
   # @return [Order]
diff --git a/samples/client/petstore/ruby-faraday/spec/custom/pet_spec.rb b/samples/client/petstore/ruby-faraday/spec/custom/pet_spec.rb
index da8ab7aca572..8b2baf8ba5f2 100644
--- a/samples/client/petstore/ruby-faraday/spec/custom/pet_spec.rb
+++ b/samples/client/petstore/ruby-faraday/spec/custom/pet_spec.rb
@@ -23,7 +23,7 @@
       tag1 = Petstore::Tag.new('id' => 1, 'name' => 'tag1')
       tag2 = Petstore::Tag.new('id' => 2, 'name' => 'tag2')
       category1 = Petstore::Category.new(:id => 1, :name => 'category unknown')
-      # initalize using both string and symbol key
+      # initialize using both string and symbol key
       pet_hash = {
         :id => @pet_id,
         :name => "RUBY UNIT TESTING",
@@ -78,7 +78,7 @@
         fail 'it should raise error'
       rescue Petstore::ApiError => e
         expect(e.code).to eq(404)
-        # skip the check as the response contains a timestamp that changes on every reponse
+        # skip the check as the response contains a timestamp that changes on every response
         # expect(e.message).to eq("Error message: the server returns an error\nHTTP status code: 404\nResponse headers: {\"Date\"=>\"Tue, 26 Feb 2019 04:35:40 GMT\", \"Access-Control-Allow-Origin\"=>\"*\", \"Access-Control-Allow-Methods\"=>\"GET, POST, DELETE, PUT\", \"Access-Control-Allow-Headers\"=>\"Content-Type, api_key, Authorization\", \"Content-Type\"=>\"application/json\", \"Connection\"=>\"close\", \"Server\"=>\"Jetty(9.2.9.v20150224)\"}\nResponse body: {\"code\":1,\"type\":\"error\",\"message\":\"Pet not found\"}")
         expect(e.response_body).to eq('{"code":1,"type":"error","message":"Pet not found"}')
         expect(e.response_headers).to include('Content-Type')
diff --git a/samples/client/petstore/ruby/docs/StoreApi.md b/samples/client/petstore/ruby/docs/StoreApi.md
index 0bccca0bec7e..52c551498cf0 100644
--- a/samples/client/petstore/ruby/docs/StoreApi.md
+++ b/samples/client/petstore/ruby/docs/StoreApi.md
@@ -147,7 +147,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Examples
 
diff --git a/samples/client/petstore/ruby/lib/petstore/api/store_api.rb b/samples/client/petstore/ruby/lib/petstore/api/store_api.rb
index 5b9bc0fea9eb..8cd9e4bf4efd 100644
--- a/samples/client/petstore/ruby/lib/petstore/api/store_api.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api/store_api.rb
@@ -138,7 +138,7 @@ def get_inventory_with_http_info(opts = {})
     end
 
     # Find purchase order by ID
-    # For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    # For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
     # @param order_id [Integer] ID of pet that needs to be fetched
     # @param [Hash] opts the optional parameters
     # @return [Order]
@@ -148,7 +148,7 @@ def get_order_by_id(order_id, opts = {})
     end
 
     # Find purchase order by ID
-    # For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    # For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
     # @param order_id [Integer] ID of pet that needs to be fetched
     # @param [Hash] opts the optional parameters
     # @return [Array<(Order, Integer, Hash)>] Order data, response status code and response headers
diff --git a/samples/client/petstore/ruby/spec/api/store_api_spec.rb b/samples/client/petstore/ruby/spec/api/store_api_spec.rb
index 1fd9faf40aaf..97c3d704de00 100644
--- a/samples/client/petstore/ruby/spec/api/store_api_spec.rb
+++ b/samples/client/petstore/ruby/spec/api/store_api_spec.rb
@@ -57,7 +57,7 @@
 
   # unit tests for get_order_by_id
   # Find purchase order by ID
-  # For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+  # For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
   # @param order_id ID of pet that needs to be fetched
   # @param [Hash] opts the optional parameters
   # @return [Order]
diff --git a/samples/client/petstore/ruby/spec/custom/pet_spec.rb b/samples/client/petstore/ruby/spec/custom/pet_spec.rb
index 8bce8cff5fc7..8b2baf8ba5f2 100644
--- a/samples/client/petstore/ruby/spec/custom/pet_spec.rb
+++ b/samples/client/petstore/ruby/spec/custom/pet_spec.rb
@@ -78,7 +78,7 @@
         fail 'it should raise error'
       rescue Petstore::ApiError => e
         expect(e.code).to eq(404)
-        # skip the check as the response contains a timestamp that changes on every reponse
+        # skip the check as the response contains a timestamp that changes on every response
         # expect(e.message).to eq("Error message: the server returns an error\nHTTP status code: 404\nResponse headers: {\"Date\"=>\"Tue, 26 Feb 2019 04:35:40 GMT\", \"Access-Control-Allow-Origin\"=>\"*\", \"Access-Control-Allow-Methods\"=>\"GET, POST, DELETE, PUT\", \"Access-Control-Allow-Headers\"=>\"Content-Type, api_key, Authorization\", \"Content-Type\"=>\"application/json\", \"Connection\"=>\"close\", \"Server\"=>\"Jetty(9.2.9.v20150224)\"}\nResponse body: {\"code\":1,\"type\":\"error\",\"message\":\"Pet not found\"}")
         expect(e.response_body).to eq('{"code":1,"type":"error","message":"Pet not found"}')
         expect(e.response_headers).to include('Content-Type')
diff --git a/samples/client/petstore/rust/hyper/petstore/docs/StoreApi.md b/samples/client/petstore/rust/hyper/petstore/docs/StoreApi.md
index c1f5b5a9c216..dbeb0169aa4d 100644
--- a/samples/client/petstore/rust/hyper/petstore/docs/StoreApi.md
+++ b/samples/client/petstore/rust/hyper/petstore/docs/StoreApi.md
@@ -73,7 +73,7 @@ This endpoint does not need any parameter.
 > crate::models::Order get_order_by_id(order_id)
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Parameters
 
diff --git a/samples/client/petstore/rust/reqwest/petstore-async/docs/StoreApi.md b/samples/client/petstore/rust/reqwest/petstore-async/docs/StoreApi.md
index a6b3c572ccc1..5796357f53ba 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async/docs/StoreApi.md
+++ b/samples/client/petstore/rust/reqwest/petstore-async/docs/StoreApi.md
@@ -73,7 +73,7 @@ This endpoint does not need any parameter.
 > crate::models::Order get_order_by_id(order_id)
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Parameters
 
diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/apis/store_api.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/apis/store_api.rs
index 36d090f4f1ae..ace7bc24e899 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async/src/apis/store_api.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async/src/apis/store_api.rs
@@ -176,7 +176,7 @@ pub async fn get_inventory(configuration: &configuration::Configuration) -> Resu
     }
 }
 
-/// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+/// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 pub async fn get_order_by_id(configuration: &configuration::Configuration, params: GetOrderByIdParams) -> Result, Error> {
     let local_var_configuration = configuration;
 
diff --git a/samples/client/petstore/rust/reqwest/petstore-async/tests/pet_tests.rs b/samples/client/petstore/rust/reqwest/petstore-async/tests/pet_tests.rs
index 8ab1927deafa..78e8e21bb092 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async/tests/pet_tests.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async/tests/pet_tests.rs
@@ -26,5 +26,5 @@ fn test_pet() {
     // get pet
     let _pet_result = petstore_reqwest_async::apis::pet_api::get_pet_by_id(&config, get_pet_params);
 
-    // TODO Testing async functions requires some additionnal testing crates.
+    // TODO Testing async functions requires some additional testing crates.
 }
diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/docs/StoreApi.md b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/docs/StoreApi.md
index a6b3c572ccc1..5796357f53ba 100644
--- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/docs/StoreApi.md
+++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/docs/StoreApi.md
@@ -73,7 +73,7 @@ This endpoint does not need any parameter.
 > crate::models::Order get_order_by_id(order_id)
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Parameters
 
diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/store_api.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/store_api.rs
index d50a60e411b7..0c71e2c08a53 100644
--- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/store_api.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/store_api.rs
@@ -126,7 +126,7 @@ pub fn get_inventory(configuration: &configuration::Configuration, ) -> Result<:
     }
 }
 
-/// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+/// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 pub fn get_order_by_id(configuration: &configuration::Configuration, order_id: i64) -> Result> {
     let local_var_configuration = configuration;
 
diff --git a/samples/client/petstore/rust/reqwest/petstore/docs/StoreApi.md b/samples/client/petstore/rust/reqwest/petstore/docs/StoreApi.md
index a6b3c572ccc1..5796357f53ba 100644
--- a/samples/client/petstore/rust/reqwest/petstore/docs/StoreApi.md
+++ b/samples/client/petstore/rust/reqwest/petstore/docs/StoreApi.md
@@ -73,7 +73,7 @@ This endpoint does not need any parameter.
 > crate::models::Order get_order_by_id(order_id)
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Parameters
 
diff --git a/samples/client/petstore/rust/reqwest/petstore/src/apis/store_api.rs b/samples/client/petstore/rust/reqwest/petstore/src/apis/store_api.rs
index f142404c3f2f..1a621384ddf6 100644
--- a/samples/client/petstore/rust/reqwest/petstore/src/apis/store_api.rs
+++ b/samples/client/petstore/rust/reqwest/petstore/src/apis/store_api.rs
@@ -113,7 +113,7 @@ pub fn get_inventory(configuration: &configuration::Configuration, ) -> Result<:
     }
 }
 
-/// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+/// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 pub fn get_order_by_id(configuration: &configuration::Configuration, order_id: i64) -> Result> {
     let local_var_configuration = configuration;
 
diff --git a/samples/client/petstore/scala-akka/docs/StoreApi.md b/samples/client/petstore/scala-akka/docs/StoreApi.md
index 28f1bace83b0..30ba1676ffa8 100644
--- a/samples/client/petstore/scala-akka/docs/StoreApi.md
+++ b/samples/client/petstore/scala-akka/docs/StoreApi.md
@@ -177,7 +177,7 @@ ApiRequest[**Map[String, Int]**]
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/api/StoreApi.scala b/samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/api/StoreApi.scala
index 6832f20dea63..d053398de230 100644
--- a/samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/api/StoreApi.scala
+++ b/samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/api/StoreApi.scala
@@ -55,7 +55,7 @@ class StoreApi(baseUrl: String) {
       
 
   /**
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    * 
    * Expected answers:
    *   code 200 : Order (successful operation)
diff --git a/samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/core/ApiInvoker.scala b/samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/core/ApiInvoker.scala
index 4b28ea9862ec..4002e9736b70 100644
--- a/samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/core/ApiInvoker.scala
+++ b/samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/core/ApiInvoker.scala
@@ -49,7 +49,7 @@ object ApiInvoker {
     * Allows request execution without calling apiInvoker.execute(request)
     * request.response can be used to get a future of the ApiResponse generated.
     * request.result can be used to get a future of the expected ApiResponse content. If content doesn't match, a
-    * Future will failed with a ClassCastException
+    * Future will fail with a ClassCastException
     *
     * @param request the apiRequest to be executed
     */
diff --git a/samples/client/petstore/scala-httpclient-deprecated/src/main/scala/org/openapitools/example/api/StoreApi.scala b/samples/client/petstore/scala-httpclient-deprecated/src/main/scala/org/openapitools/example/api/StoreApi.scala
index 949585575e9e..638377634063 100644
--- a/samples/client/petstore/scala-httpclient-deprecated/src/main/scala/org/openapitools/example/api/StoreApi.scala
+++ b/samples/client/petstore/scala-httpclient-deprecated/src/main/scala/org/openapitools/example/api/StoreApi.scala
@@ -126,7 +126,7 @@ class StoreApi(
 
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    *
    * @param orderId ID of pet that needs to be fetched 
    * @return Order
@@ -141,7 +141,7 @@ class StoreApi(
 
   /**
    * Find purchase order by ID asynchronously
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    *
    * @param orderId ID of pet that needs to be fetched 
    * @return Future(Order)
diff --git a/samples/client/petstore/scala-httpclient/bin/org/openapitools/client/api/StoreApi.scala b/samples/client/petstore/scala-httpclient/bin/org/openapitools/client/api/StoreApi.scala
index 4328080db938..1dfdc82b9930 100644
--- a/samples/client/petstore/scala-httpclient/bin/org/openapitools/client/api/StoreApi.scala
+++ b/samples/client/petstore/scala-httpclient/bin/org/openapitools/client/api/StoreApi.scala
@@ -126,7 +126,7 @@ class StoreApi(
 
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    *
    * @param orderId ID of pet that needs to be fetched 
    * @return Order
@@ -141,7 +141,7 @@ class StoreApi(
 
   /**
    * Find purchase order by ID asynchronously
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    *
    * @param orderId ID of pet that needs to be fetched 
    * @return Future(Order)
diff --git a/samples/client/petstore/scala-httpclient/git_push.sh b/samples/client/petstore/scala-httpclient/git_push.sh
index ced3be2b0c7b..200e975d2120 100644
--- a/samples/client/petstore/scala-httpclient/git_push.sh
+++ b/samples/client/petstore/scala-httpclient/git_push.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update" "gitlab.com"
 
 git_user_id=$1
 git_repo_id=$2
diff --git a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/api/StoreApi.scala b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/api/StoreApi.scala
index 51b392338505..3104619836bf 100644
--- a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/api/StoreApi.scala
+++ b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/api/StoreApi.scala
@@ -126,7 +126,7 @@ class StoreApi(
 
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    *
    * @param orderId ID of pet that needs to be fetched 
    * @return Order
@@ -141,7 +141,7 @@ class StoreApi(
 
   /**
    * Find purchase order by ID asynchronously
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    *
    * @param orderId ID of pet that needs to be fetched 
    * @return Future(Order)
diff --git a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/StoreApi.scala b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/StoreApi.scala
index e4db9be33b9b..10699532398f 100644
--- a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/StoreApi.scala
+++ b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/StoreApi.scala
@@ -57,7 +57,7 @@ class StoreApi(baseUrl: String) {
       .response(asJson[Map[String, Int]])
 
   /**
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    * 
    * Expected answers:
    *   code 200 : Order (successful operation)
diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java
index 9b1d6de4fe5b..32116e54714b 100644
--- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java
@@ -88,7 +88,7 @@ CompletableFuture>> getInventory(
 
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
@@ -99,7 +99,7 @@ CompletableFuture>> getInventory(
         tags = { "store" },
         value = "Find purchase order by ID",
         nickname = "getOrderById",
-        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         response = Order.class
     )
     @ApiResponses({
diff --git a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java
index 8b46211dc20d..04a64a05c841 100644
--- a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java
+++ b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java
@@ -63,7 +63,7 @@ ResponseEntity get(
      * update with form data
      *
      * @param date A date path parameter (required)
-     * @param visitDate Updated last vist timestamp (optional, default to 1971-12-19T03:39:57-08:00)
+     * @param visitDate Updated last visit timestamp (optional, default to 1971-12-19T03:39:57-08:00)
      * @return Invalid input (status code 405)
      */
     @ApiOperation(
@@ -81,7 +81,7 @@ ResponseEntity get(
     )
     ResponseEntity updatePetWithForm(
         @ApiParam(value = "A date path parameter", required = true, defaultValue = "1970-01-01") @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
-        @ApiParam(value = "Updated last vist timestamp", defaultValue = "1971-12-19T03:39:57-08:00") @Valid @RequestParam(value = "visitDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime visitDate
+        @ApiParam(value = "Updated last visit timestamp", defaultValue = "1971-12-19T03:39:57-08:00") @Valid @RequestParam(value = "visitDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime visitDate
     );
 
 }
diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java
index 26f7bb20bd0f..b7426d301e81 100644
--- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java
@@ -87,7 +87,7 @@ ResponseEntity> getInventory(
 
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
@@ -98,7 +98,7 @@ ResponseEntity> getInventory(
         tags = { "store" },
         value = "Find purchase order by ID",
         nickname = "getOrderById",
-        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         response = Order.class
     )
     @ApiResponses({
diff --git a/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/StoreApi.java
index e03a4fbf787b..85780a64fdc7 100644
--- a/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/StoreApi.java
@@ -72,7 +72,7 @@ public interface StoreApi {
 
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
@@ -80,7 +80,7 @@ public interface StoreApi {
      *         or Order not found (status code 404)
      */
 
-    @ApiOperation(value = "Find purchase order by ID", nickname = "getOrderById", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class, tags={ "store", })
+    @ApiOperation(value = "Find purchase order by ID", nickname = "getOrderById", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions", response = Order.class, tags={ "store", })
     @ApiResponses(value = { 
 
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java
index b24e4da04e0b..43cca0751e3a 100644
--- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java
@@ -87,7 +87,7 @@ ResponseEntity> getInventory(
 
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
@@ -98,7 +98,7 @@ ResponseEntity> getInventory(
         tags = { "store" },
         value = "Find purchase order by ID",
         nickname = "getOrderById",
-        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         response = Order.class
     )
     @ApiResponses({
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java
index 26f7bb20bd0f..b7426d301e81 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java
@@ -87,7 +87,7 @@ ResponseEntity> getInventory(
 
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
@@ -98,7 +98,7 @@ ResponseEntity> getInventory(
         tags = { "store" },
         value = "Find purchase order by ID",
         nickname = "getOrderById",
-        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         response = Order.class
     )
     @ApiResponses({
diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java
index 128aa8b87f1f..a676f2bf4d1c 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java
@@ -98,7 +98,7 @@ default ResponseEntity> getInventory(
 
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
@@ -109,7 +109,7 @@ default ResponseEntity> getInventory(
         tags = { "store" },
         value = "Find purchase order by ID",
         nickname = "getOrderById",
-        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         response = Order.class
     )
     @ApiResponses({
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
index ce35f8dbc7db..03f3b1259b08 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
@@ -64,7 +64,7 @@ public struct APIHelper {
 
     /// maps all values from source to query parameters
     ///
-    /// explode attribute is respected: collection values might be either joined or split up into seperate key value pairs
+    /// explode attribute is respected: collection values might be either joined or split up into separate key value pairs
     public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: Any?, isExplode: Bool)]) -> [URLQueryItem]? {
         let destination = source.filter { $0.value.wrappedValue != nil }.reduce(into: [URLQueryItem]()) { result, item in
             if let collection = item.value.wrappedValue as? [Any?] {
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index 93671ed852a9..fd939fc16925 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -247,7 +247,7 @@ open class PetAPI {
      - GET /pet/{petId}
      - Returns a single pet
      - API Key:
-       - type: apiKey api_key 
+       - type: apiKey api_key (HEADER)
        - name: api_key
      - parameter petId: (path) ID of pet to return 
      - returns: RequestBuilder 
diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
index c8416218db1c..ad60d97fa921 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
@@ -82,7 +82,7 @@ open class StoreAPI {
      - GET /store/inventory
      - Returns a map of status codes to quantities
      - API Key:
-       - type: apiKey api_key 
+       - type: apiKey api_key (HEADER)
        - name: api_key
      - returns: RequestBuilder<[String: Int]> 
      */
@@ -126,7 +126,7 @@ open class StoreAPI {
     /**
      Find purchase order by ID
      - GET /store/order/{order_id}
-     - For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     - For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      - parameter orderId: (path) ID of pet that needs to be fetched 
      - returns: RequestBuilder 
      */
diff --git a/samples/client/petstore/swift5/alamofireLibrary/docs/StoreAPI.md b/samples/client/petstore/swift5/alamofireLibrary/docs/StoreAPI.md
index b023aa9e4523..edb75e33b70b 100644
--- a/samples/client/petstore/swift5/alamofireLibrary/docs/StoreAPI.md
+++ b/samples/client/petstore/swift5/alamofireLibrary/docs/StoreAPI.md
@@ -113,7 +113,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```swift
diff --git a/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
index ce35f8dbc7db..03f3b1259b08 100644
--- a/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
+++ b/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
@@ -64,7 +64,7 @@ public struct APIHelper {
 
     /// maps all values from source to query parameters
     ///
-    /// explode attribute is respected: collection values might be either joined or split up into seperate key value pairs
+    /// explode attribute is respected: collection values might be either joined or split up into separate key value pairs
     public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: Any?, isExplode: Bool)]) -> [URLQueryItem]? {
         let destination = source.filter { $0.value.wrappedValue != nil }.reduce(into: [URLQueryItem]()) { result, item in
             if let collection = item.value.wrappedValue as? [Any?] {
diff --git a/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index 9c86f63bd84c..d987aa3c8c07 100644
--- a/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -312,7 +312,7 @@ open class PetAPI {
      - GET /pet/{petId}
      - Returns a single pet
      - API Key:
-       - type: apiKey api_key 
+       - type: apiKey api_key (HEADER)
        - name: api_key
      - parameter petId: (path) ID of pet to return 
      - returns: RequestBuilder 
diff --git a/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
index 503083b5df39..04fcfacade46 100644
--- a/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
@@ -108,7 +108,7 @@ open class StoreAPI {
      - GET /store/inventory
      - Returns a map of status codes to quantities
      - API Key:
-       - type: apiKey api_key 
+       - type: apiKey api_key (HEADER)
        - name: api_key
      - returns: RequestBuilder<[String: Int]> 
      */
@@ -165,7 +165,7 @@ open class StoreAPI {
     /**
      Find purchase order by ID
      - GET /store/order/{order_id}
-     - For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     - For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      - parameter orderId: (path) ID of pet that needs to be fetched 
      - returns: RequestBuilder 
      */
diff --git a/samples/client/petstore/swift5/asyncAwaitLibrary/docs/StoreAPI.md b/samples/client/petstore/swift5/asyncAwaitLibrary/docs/StoreAPI.md
index b023aa9e4523..edb75e33b70b 100644
--- a/samples/client/petstore/swift5/asyncAwaitLibrary/docs/StoreAPI.md
+++ b/samples/client/petstore/swift5/asyncAwaitLibrary/docs/StoreAPI.md
@@ -113,7 +113,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```swift
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
index ce35f8dbc7db..03f3b1259b08 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
@@ -64,7 +64,7 @@ public struct APIHelper {
 
     /// maps all values from source to query parameters
     ///
-    /// explode attribute is respected: collection values might be either joined or split up into seperate key value pairs
+    /// explode attribute is respected: collection values might be either joined or split up into separate key value pairs
     public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: Any?, isExplode: Bool)]) -> [URLQueryItem]? {
         let destination = source.filter { $0.value.wrappedValue != nil }.reduce(into: [URLQueryItem]()) { result, item in
             if let collection = item.value.wrappedValue as? [Any?] {
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index a9033a06cc3e..6168c1e5a2a4 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -290,7 +290,7 @@ open class PetAPI {
      - GET /pet/{petId}
      - Returns a single pet
      - API Key:
-       - type: apiKey api_key 
+       - type: apiKey api_key (HEADER)
        - name: api_key
      - parameter petId: (path) ID of pet to return 
      - returns: RequestBuilder 
diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
index 0b1e198919f5..ad4b140d7014 100644
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
@@ -101,7 +101,7 @@ open class StoreAPI {
      - GET /store/inventory
      - Returns a map of status codes to quantities
      - API Key:
-       - type: apiKey api_key 
+       - type: apiKey api_key (HEADER)
        - name: api_key
      - returns: RequestBuilder<[String: Int]> 
      */
@@ -153,7 +153,7 @@ open class StoreAPI {
     /**
      Find purchase order by ID
      - GET /store/order/{order_id}
-     - For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     - For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      - parameter orderId: (path) ID of pet that needs to be fetched 
      - returns: RequestBuilder 
      */
diff --git a/samples/client/petstore/swift5/combineLibrary/docs/StoreAPI.md b/samples/client/petstore/swift5/combineLibrary/docs/StoreAPI.md
index b023aa9e4523..edb75e33b70b 100644
--- a/samples/client/petstore/swift5/combineLibrary/docs/StoreAPI.md
+++ b/samples/client/petstore/swift5/combineLibrary/docs/StoreAPI.md
@@ -113,7 +113,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```swift
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
index ce35f8dbc7db..03f3b1259b08 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
@@ -64,7 +64,7 @@ public struct APIHelper {
 
     /// maps all values from source to query parameters
     ///
-    /// explode attribute is respected: collection values might be either joined or split up into seperate key value pairs
+    /// explode attribute is respected: collection values might be either joined or split up into separate key value pairs
     public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: Any?, isExplode: Bool)]) -> [URLQueryItem]? {
         let destination = source.filter { $0.value.wrappedValue != nil }.reduce(into: [URLQueryItem]()) { result, item in
             if let collection = item.value.wrappedValue as? [Any?] {
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index ea6d47353908..7a6dd52e8054 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -244,7 +244,7 @@ open class PetAPI {
      - GET /pet/{petId}
      - Returns a single pet
      - API Key:
-       - type: apiKey api_key 
+       - type: apiKey api_key (HEADER)
        - name: api_key
      - parameter petId: (path) ID of pet to return 
      - returns: RequestBuilder 
diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
index c8416218db1c..ad60d97fa921 100644
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
@@ -82,7 +82,7 @@ open class StoreAPI {
      - GET /store/inventory
      - Returns a map of status codes to quantities
      - API Key:
-       - type: apiKey api_key 
+       - type: apiKey api_key (HEADER)
        - name: api_key
      - returns: RequestBuilder<[String: Int]> 
      */
@@ -126,7 +126,7 @@ open class StoreAPI {
     /**
      Find purchase order by ID
      - GET /store/order/{order_id}
-     - For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     - For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      - parameter orderId: (path) ID of pet that needs to be fetched 
      - returns: RequestBuilder 
      */
diff --git a/samples/client/petstore/swift5/default/docs/StoreAPI.md b/samples/client/petstore/swift5/default/docs/StoreAPI.md
index b023aa9e4523..edb75e33b70b 100644
--- a/samples/client/petstore/swift5/default/docs/StoreAPI.md
+++ b/samples/client/petstore/swift5/default/docs/StoreAPI.md
@@ -113,7 +113,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```swift
diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
index ce35f8dbc7db..03f3b1259b08 100644
--- a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
+++ b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
@@ -64,7 +64,7 @@ public struct APIHelper {
 
     /// maps all values from source to query parameters
     ///
-    /// explode attribute is respected: collection values might be either joined or split up into seperate key value pairs
+    /// explode attribute is respected: collection values might be either joined or split up into separate key value pairs
     public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: Any?, isExplode: Bool)]) -> [URLQueryItem]? {
         let destination = source.filter { $0.value.wrappedValue != nil }.reduce(into: [URLQueryItem]()) { result, item in
             if let collection = item.value.wrappedValue as? [Any?] {
diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index ebd4e6d887a8..2bf98b094706 100644
--- a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -246,7 +246,7 @@ open class PetAPI {
      - GET /pet/{petId}
      - Returns a single pet
      - API Key:
-       - type: apiKey api_key 
+       - type: apiKey api_key (HEADER)
        - name: api_key
      - parameter petId: (path) ID of pet to return 
      - returns: RequestBuilder 
diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
index 01e80e98e26d..af2006a55669 100644
--- a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
@@ -82,7 +82,7 @@ open class StoreAPI {
      - GET /store/inventory
      - Returns a map of status codes to quantities
      - API Key:
-       - type: apiKey api_key 
+       - type: apiKey api_key (HEADER)
        - name: api_key
      - returns: RequestBuilder<[String: Int]> 
      */
@@ -126,7 +126,7 @@ open class StoreAPI {
     /**
      Find purchase order by ID
      - GET /store/order/{orderId}
-     - For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     - For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      - parameter orderId: (path) ID of pet that needs to be fetched 
      - returns: RequestBuilder 
      */
diff --git a/samples/client/petstore/swift5/deprecated/docs/StoreAPI.md b/samples/client/petstore/swift5/deprecated/docs/StoreAPI.md
index db4d3aa1fb4b..dad23c0f8f62 100644
--- a/samples/client/petstore/swift5/deprecated/docs/StoreAPI.md
+++ b/samples/client/petstore/swift5/deprecated/docs/StoreAPI.md
@@ -113,7 +113,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```swift
diff --git a/samples/client/petstore/swift5/frozenEnums/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/frozenEnums/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
index ce35f8dbc7db..03f3b1259b08 100644
--- a/samples/client/petstore/swift5/frozenEnums/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
+++ b/samples/client/petstore/swift5/frozenEnums/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
@@ -64,7 +64,7 @@ public struct APIHelper {
 
     /// maps all values from source to query parameters
     ///
-    /// explode attribute is respected: collection values might be either joined or split up into seperate key value pairs
+    /// explode attribute is respected: collection values might be either joined or split up into separate key value pairs
     public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: Any?, isExplode: Bool)]) -> [URLQueryItem]? {
         let destination = source.filter { $0.value.wrappedValue != nil }.reduce(into: [URLQueryItem]()) { result, item in
             if let collection = item.value.wrappedValue as? [Any?] {
diff --git a/samples/client/petstore/swift5/frozenEnums/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift5/frozenEnums/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index 054422bbe342..8437ad00a2cf 100644
--- a/samples/client/petstore/swift5/frozenEnums/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/frozenEnums/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -247,7 +247,7 @@ open class PetAPI {
      - GET /pet/{petId}
      - Returns a single pet
      - API Key:
-       - type: apiKey api_key 
+       - type: apiKey api_key (HEADER)
        - name: api_key
      - parameter petId: (path) ID of pet to return 
      - returns: RequestBuilder 
diff --git a/samples/client/petstore/swift5/frozenEnums/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift5/frozenEnums/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
index c8416218db1c..ad60d97fa921 100644
--- a/samples/client/petstore/swift5/frozenEnums/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift5/frozenEnums/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
@@ -82,7 +82,7 @@ open class StoreAPI {
      - GET /store/inventory
      - Returns a map of status codes to quantities
      - API Key:
-       - type: apiKey api_key 
+       - type: apiKey api_key (HEADER)
        - name: api_key
      - returns: RequestBuilder<[String: Int]> 
      */
@@ -126,7 +126,7 @@ open class StoreAPI {
     /**
      Find purchase order by ID
      - GET /store/order/{order_id}
-     - For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     - For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      - parameter orderId: (path) ID of pet that needs to be fetched 
      - returns: RequestBuilder 
      */
diff --git a/samples/client/petstore/swift5/frozenEnums/docs/StoreAPI.md b/samples/client/petstore/swift5/frozenEnums/docs/StoreAPI.md
index b023aa9e4523..edb75e33b70b 100644
--- a/samples/client/petstore/swift5/frozenEnums/docs/StoreAPI.md
+++ b/samples/client/petstore/swift5/frozenEnums/docs/StoreAPI.md
@@ -113,7 +113,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```swift
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
index 2ca9a6df1c50..b265c06f0f9e 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
@@ -64,7 +64,7 @@ internal struct APIHelper {
 
     /// maps all values from source to query parameters
     ///
-    /// explode attribute is respected: collection values might be either joined or split up into seperate key value pairs
+    /// explode attribute is respected: collection values might be either joined or split up into separate key value pairs
     internal static func mapValuesToQueryItems(_ source: [String: (wrappedValue: Any?, isExplode: Bool)]) -> [URLQueryItem]? {
         let destination = source.filter { $0.value.wrappedValue != nil }.reduce(into: [URLQueryItem]()) { result, item in
             if let collection = item.value.wrappedValue as? [Any?] {
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index 143d7aa284c1..88bf373f4da8 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -247,7 +247,7 @@ internal class PetAPI {
      - GET /pet/{petId}
      - Returns a single pet
      - API Key:
-       - type: apiKey api_key 
+       - type: apiKey api_key (HEADER)
        - name: api_key
      - parameter petId: (path) ID of pet to return 
      - returns: RequestBuilder 
diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
index 78f99758e68b..80fe43931dae 100644
--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
@@ -82,7 +82,7 @@ internal class StoreAPI {
      - GET /store/inventory
      - Returns a map of status codes to quantities
      - API Key:
-       - type: apiKey api_key 
+       - type: apiKey api_key (HEADER)
        - name: api_key
      - returns: RequestBuilder<[String: Int]> 
      */
@@ -126,7 +126,7 @@ internal class StoreAPI {
     /**
      Find purchase order by ID
      - GET /store/order/{order_id}
-     - For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     - For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      - parameter orderId: (path) ID of pet that needs to be fetched 
      - returns: RequestBuilder 
      */
diff --git a/samples/client/petstore/swift5/nonPublicApi/docs/StoreAPI.md b/samples/client/petstore/swift5/nonPublicApi/docs/StoreAPI.md
index 100cf07cdc80..37b5e1142165 100644
--- a/samples/client/petstore/swift5/nonPublicApi/docs/StoreAPI.md
+++ b/samples/client/petstore/swift5/nonPublicApi/docs/StoreAPI.md
@@ -113,7 +113,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```swift
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
index ce35f8dbc7db..03f3b1259b08 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
@@ -64,7 +64,7 @@ public struct APIHelper {
 
     /// maps all values from source to query parameters
     ///
-    /// explode attribute is respected: collection values might be either joined or split up into seperate key value pairs
+    /// explode attribute is respected: collection values might be either joined or split up into separate key value pairs
     public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: Any?, isExplode: Bool)]) -> [URLQueryItem]? {
         let destination = source.filter { $0.value.wrappedValue != nil }.reduce(into: [URLQueryItem]()) { result, item in
             if let collection = item.value.wrappedValue as? [Any?] {
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index 06cdfc06cc75..e41eadc6656e 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -247,7 +247,7 @@ import AnyCodable
      - GET /pet/{petId}
      - Returns a single pet
      - API Key:
-       - type: apiKey api_key 
+       - type: apiKey api_key (HEADER)
        - name: api_key
      - parameter petId: (path) ID of pet to return 
      - returns: RequestBuilder 
diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
index 770d143f0aa3..e28e22929a71 100644
--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
@@ -82,7 +82,7 @@ import AnyCodable
      - GET /store/inventory
      - Returns a map of status codes to quantities
      - API Key:
-       - type: apiKey api_key 
+       - type: apiKey api_key (HEADER)
        - name: api_key
      - returns: RequestBuilder<[String: Int]> 
      */
@@ -126,7 +126,7 @@ import AnyCodable
     /**
      Find purchase order by ID
      - GET /store/order/{order_id}
-     - For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     - For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      - parameter orderId: (path) ID of pet that needs to be fetched 
      - returns: RequestBuilder 
      */
diff --git a/samples/client/petstore/swift5/objcCompatible/docs/StoreAPI.md b/samples/client/petstore/swift5/objcCompatible/docs/StoreAPI.md
index dd4c3d8b044f..6480c8639120 100644
--- a/samples/client/petstore/swift5/objcCompatible/docs/StoreAPI.md
+++ b/samples/client/petstore/swift5/objcCompatible/docs/StoreAPI.md
@@ -113,7 +113,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```swift
diff --git a/samples/client/petstore/swift5/oneOf/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/oneOf/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
index ce35f8dbc7db..03f3b1259b08 100644
--- a/samples/client/petstore/swift5/oneOf/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
+++ b/samples/client/petstore/swift5/oneOf/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
@@ -64,7 +64,7 @@ public struct APIHelper {
 
     /// maps all values from source to query parameters
     ///
-    /// explode attribute is respected: collection values might be either joined or split up into seperate key value pairs
+    /// explode attribute is respected: collection values might be either joined or split up into separate key value pairs
     public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: Any?, isExplode: Bool)]) -> [URLQueryItem]? {
         let destination = source.filter { $0.value.wrappedValue != nil }.reduce(into: [URLQueryItem]()) { result, item in
             if let collection = item.value.wrappedValue as? [Any?] {
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
index ce35f8dbc7db..03f3b1259b08 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
@@ -64,7 +64,7 @@ public struct APIHelper {
 
     /// maps all values from source to query parameters
     ///
-    /// explode attribute is respected: collection values might be either joined or split up into seperate key value pairs
+    /// explode attribute is respected: collection values might be either joined or split up into separate key value pairs
     public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: Any?, isExplode: Bool)]) -> [URLQueryItem]? {
         let destination = source.filter { $0.value.wrappedValue != nil }.reduce(into: [URLQueryItem]()) { result, item in
             if let collection = item.value.wrappedValue as? [Any?] {
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index 51ed84dfc826..cb3024703f17 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -248,7 +248,7 @@ open class PetAPI {
      - GET /pet/{petId}
      - Returns a single pet
      - API Key:
-       - type: apiKey api_key 
+       - type: apiKey api_key (HEADER)
        - name: api_key
      - parameter petId: (path) ID of pet to return 
      - returns: RequestBuilder 
diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
index 7cd506b1f7e4..bcba455ea172 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
@@ -83,7 +83,7 @@ open class StoreAPI {
      - GET /store/inventory
      - Returns a map of status codes to quantities
      - API Key:
-       - type: apiKey api_key 
+       - type: apiKey api_key (HEADER)
        - name: api_key
      - returns: RequestBuilder<[String: Int]> 
      */
@@ -127,7 +127,7 @@ open class StoreAPI {
     /**
      Find purchase order by ID
      - GET /store/order/{order_id}
-     - For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     - For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      - parameter orderId: (path) ID of pet that needs to be fetched 
      - returns: RequestBuilder 
      */
diff --git a/samples/client/petstore/swift5/promisekitLibrary/docs/StoreAPI.md b/samples/client/petstore/swift5/promisekitLibrary/docs/StoreAPI.md
index 1477d3239261..662f1cf5b036 100644
--- a/samples/client/petstore/swift5/promisekitLibrary/docs/StoreAPI.md
+++ b/samples/client/petstore/swift5/promisekitLibrary/docs/StoreAPI.md
@@ -107,7 +107,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```swift
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
index ce35f8dbc7db..03f3b1259b08 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
@@ -64,7 +64,7 @@ public struct APIHelper {
 
     /// maps all values from source to query parameters
     ///
-    /// explode attribute is respected: collection values might be either joined or split up into seperate key value pairs
+    /// explode attribute is respected: collection values might be either joined or split up into separate key value pairs
     public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: Any?, isExplode: Bool)]) -> [URLQueryItem]? {
         let destination = source.filter { $0.value.wrappedValue != nil }.reduce(into: [URLQueryItem]()) { result, item in
             if let collection = item.value.wrappedValue as? [Any?] {
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index 93671ed852a9..fd939fc16925 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -247,7 +247,7 @@ open class PetAPI {
      - GET /pet/{petId}
      - Returns a single pet
      - API Key:
-       - type: apiKey api_key 
+       - type: apiKey api_key (HEADER)
        - name: api_key
      - parameter petId: (path) ID of pet to return 
      - returns: RequestBuilder 
diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
index c8416218db1c..ad60d97fa921 100644
--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
@@ -82,7 +82,7 @@ open class StoreAPI {
      - GET /store/inventory
      - Returns a map of status codes to quantities
      - API Key:
-       - type: apiKey api_key 
+       - type: apiKey api_key (HEADER)
        - name: api_key
      - returns: RequestBuilder<[String: Int]> 
      */
@@ -126,7 +126,7 @@ open class StoreAPI {
     /**
      Find purchase order by ID
      - GET /store/order/{order_id}
-     - For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     - For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      - parameter orderId: (path) ID of pet that needs to be fetched 
      - returns: RequestBuilder 
      */
diff --git a/samples/client/petstore/swift5/readonlyProperties/docs/StoreAPI.md b/samples/client/petstore/swift5/readonlyProperties/docs/StoreAPI.md
index b023aa9e4523..edb75e33b70b 100644
--- a/samples/client/petstore/swift5/readonlyProperties/docs/StoreAPI.md
+++ b/samples/client/petstore/swift5/readonlyProperties/docs/StoreAPI.md
@@ -113,7 +113,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```swift
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
index ce35f8dbc7db..03f3b1259b08 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
@@ -64,7 +64,7 @@ public struct APIHelper {
 
     /// maps all values from source to query parameters
     ///
-    /// explode attribute is respected: collection values might be either joined or split up into seperate key value pairs
+    /// explode attribute is respected: collection values might be either joined or split up into separate key value pairs
     public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: Any?, isExplode: Bool)]) -> [URLQueryItem]? {
         let destination = source.filter { $0.value.wrappedValue != nil }.reduce(into: [URLQueryItem]()) { result, item in
             if let collection = item.value.wrappedValue as? [Any?] {
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index f685b49335c1..11b47c07c901 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -247,7 +247,7 @@ open class PetAPI {
      - GET /pet/{petId}
      - Returns a single pet
      - API Key:
-       - type: apiKey api_key 
+       - type: apiKey api_key (HEADER)
        - name: api_key
      - parameter petId: (path) ID of pet to return 
      - returns: RequestBuilder 
diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
index 70d00552d83a..908a134c0741 100644
--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
@@ -82,7 +82,7 @@ open class StoreAPI {
      - GET /store/inventory
      - Returns a map of status codes to quantities
      - API Key:
-       - type: apiKey api_key 
+       - type: apiKey api_key (HEADER)
        - name: api_key
      - returns: RequestBuilder<[String: Int]> 
      */
@@ -126,7 +126,7 @@ open class StoreAPI {
     /**
      Find purchase order by ID
      - GET /store/order/{order_id}
-     - For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     - For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      - parameter orderId: (path) ID of pet that needs to be fetched 
      - returns: RequestBuilder 
      */
diff --git a/samples/client/petstore/swift5/resultLibrary/docs/StoreAPI.md b/samples/client/petstore/swift5/resultLibrary/docs/StoreAPI.md
index b023aa9e4523..edb75e33b70b 100644
--- a/samples/client/petstore/swift5/resultLibrary/docs/StoreAPI.md
+++ b/samples/client/petstore/swift5/resultLibrary/docs/StoreAPI.md
@@ -113,7 +113,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```swift
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
index ce35f8dbc7db..03f3b1259b08 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
@@ -64,7 +64,7 @@ public struct APIHelper {
 
     /// maps all values from source to query parameters
     ///
-    /// explode attribute is respected: collection values might be either joined or split up into seperate key value pairs
+    /// explode attribute is respected: collection values might be either joined or split up into separate key value pairs
     public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: Any?, isExplode: Bool)]) -> [URLQueryItem]? {
         let destination = source.filter { $0.value.wrappedValue != nil }.reduce(into: [URLQueryItem]()) { result, item in
             if let collection = item.value.wrappedValue as? [Any?] {
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index 2426be2a7730..c77f9e94482d 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -278,7 +278,7 @@ open class PetAPI {
      - GET /pet/{petId}
      - Returns a single pet
      - API Key:
-       - type: apiKey api_key 
+       - type: apiKey api_key (HEADER)
        - name: api_key
      - parameter petId: (path) ID of pet to return 
      - returns: RequestBuilder 
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
index fb827f845873..7a24e880f617 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
@@ -95,7 +95,7 @@ open class StoreAPI {
      - GET /store/inventory
      - Returns a map of status codes to quantities
      - API Key:
-       - type: apiKey api_key 
+       - type: apiKey api_key (HEADER)
        - name: api_key
      - returns: RequestBuilder<[String: Int]> 
      */
@@ -145,7 +145,7 @@ open class StoreAPI {
     /**
      Find purchase order by ID
      - GET /store/order/{order_id}
-     - For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     - For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      - parameter orderId: (path) ID of pet that needs to be fetched 
      - returns: RequestBuilder 
      */
diff --git a/samples/client/petstore/swift5/rxswiftLibrary/docs/StoreAPI.md b/samples/client/petstore/swift5/rxswiftLibrary/docs/StoreAPI.md
index 8d795213c0f2..ae87d585c5c4 100644
--- a/samples/client/petstore/swift5/rxswiftLibrary/docs/StoreAPI.md
+++ b/samples/client/petstore/swift5/rxswiftLibrary/docs/StoreAPI.md
@@ -93,7 +93,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```swift
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIHelper.swift b/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIHelper.swift
index ce35f8dbc7db..03f3b1259b08 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIHelper.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIHelper.swift
@@ -64,7 +64,7 @@ public struct APIHelper {
 
     /// maps all values from source to query parameters
     ///
-    /// explode attribute is respected: collection values might be either joined or split up into seperate key value pairs
+    /// explode attribute is respected: collection values might be either joined or split up into separate key value pairs
     public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: Any?, isExplode: Bool)]) -> [URLQueryItem]? {
         let destination = source.filter { $0.value.wrappedValue != nil }.reduce(into: [URLQueryItem]()) { result, item in
             if let collection = item.value.wrappedValue as? [Any?] {
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs/PetAPI.swift b/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs/PetAPI.swift
index 1d2a16db1df1..84098b22ee00 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs/PetAPI.swift
@@ -250,7 +250,7 @@ open class PetAPI {
      - GET /pet/{petId}
      - Returns a single pet
      - API Key:
-       - type: apiKey api_key 
+       - type: apiKey api_key (HEADER)
        - name: api_key
      - parameter petId: (path) ID of pet to return 
      - returns: RequestBuilder 
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs/StoreAPI.swift b/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs/StoreAPI.swift
index 1d449dbbb7ab..7eca4142f5fe 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs/StoreAPI.swift
@@ -85,7 +85,7 @@ open class StoreAPI {
      - GET /store/inventory
      - Returns a map of status codes to quantities
      - API Key:
-       - type: apiKey api_key 
+       - type: apiKey api_key (HEADER)
        - name: api_key
      - returns: RequestBuilder<[String: Int]> 
      */
@@ -129,7 +129,7 @@ open class StoreAPI {
     /**
      Find purchase order by ID
      - GET /store/order/{order_id}
-     - For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     - For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      - parameter orderId: (path) ID of pet that needs to be fetched 
      - returns: RequestBuilder 
      */
diff --git a/samples/client/petstore/swift5/urlsessionLibrary/docs/StoreAPI.md b/samples/client/petstore/swift5/urlsessionLibrary/docs/StoreAPI.md
index b023aa9e4523..edb75e33b70b 100644
--- a/samples/client/petstore/swift5/urlsessionLibrary/docs/StoreAPI.md
+++ b/samples/client/petstore/swift5/urlsessionLibrary/docs/StoreAPI.md
@@ -113,7 +113,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```swift
diff --git a/samples/client/petstore/swift5/vaporLibrary/Sources/PetstoreClient/APIs/PetAPI.swift b/samples/client/petstore/swift5/vaporLibrary/Sources/PetstoreClient/APIs/PetAPI.swift
index 5e8015215015..78177ef4dd36 100644
--- a/samples/client/petstore/swift5/vaporLibrary/Sources/PetstoreClient/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/vaporLibrary/Sources/PetstoreClient/APIs/PetAPI.swift
@@ -271,7 +271,7 @@ open class PetAPI {
      GET /pet/{petId}
      Returns a single pet
      - API Key:
-       - type: apiKey api_key 
+       - type: apiKey api_key (HEADER)
        - name: api_key
      - parameter petId: (path) ID of pet to return 
      - returns: `EventLoopFuture` of `ClientResponse` 
@@ -308,7 +308,7 @@ open class PetAPI {
      GET /pet/{petId}
      Returns a single pet
      - API Key:
-       - type: apiKey api_key 
+       - type: apiKey api_key (HEADER)
        - name: api_key
      - parameter petId: (path) ID of pet to return 
      - returns: `EventLoopFuture` of `GetPetById` 
diff --git a/samples/client/petstore/swift5/vaporLibrary/Sources/PetstoreClient/APIs/StoreAPI.swift b/samples/client/petstore/swift5/vaporLibrary/Sources/PetstoreClient/APIs/StoreAPI.swift
index d802c4c765ed..a71ba07e86f1 100644
--- a/samples/client/petstore/swift5/vaporLibrary/Sources/PetstoreClient/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift5/vaporLibrary/Sources/PetstoreClient/APIs/StoreAPI.swift
@@ -71,7 +71,7 @@ open class StoreAPI {
      GET /store/inventory
      Returns a map of status codes to quantities
      - API Key:
-       - type: apiKey api_key 
+       - type: apiKey api_key (HEADER)
        - name: api_key
      - returns: `EventLoopFuture` of `ClientResponse` 
      */
@@ -102,7 +102,7 @@ open class StoreAPI {
      GET /store/inventory
      Returns a map of status codes to quantities
      - API Key:
-       - type: apiKey api_key 
+       - type: apiKey api_key (HEADER)
        - name: api_key
      - returns: `EventLoopFuture` of `GetInventory` 
      */
@@ -120,7 +120,7 @@ open class StoreAPI {
     /**
      Find purchase order by ID
      GET /store/order/{order_id}
-     For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      - parameter orderId: (path) ID of pet that needs to be fetched 
      - returns: `EventLoopFuture` of `ClientResponse` 
      */
@@ -154,7 +154,7 @@ open class StoreAPI {
     /**
      Find purchase order by ID
      GET /store/order/{order_id}
-     For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      - parameter orderId: (path) ID of pet that needs to be fetched 
      - returns: `EventLoopFuture` of `GetOrderById` 
      */
diff --git a/samples/client/petstore/swift5/vaporLibrary/docs/StoreAPI.md b/samples/client/petstore/swift5/vaporLibrary/docs/StoreAPI.md
index a56d51e05eb2..1feb1b0e0b45 100644
--- a/samples/client/petstore/swift5/vaporLibrary/docs/StoreAPI.md
+++ b/samples/client/petstore/swift5/vaporLibrary/docs/StoreAPI.md
@@ -133,7 +133,7 @@ public enum GetInventory {
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```swift
diff --git a/samples/client/petstore/swift5/x-swift-hashable/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/x-swift-hashable/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
index ce35f8dbc7db..03f3b1259b08 100644
--- a/samples/client/petstore/swift5/x-swift-hashable/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
+++ b/samples/client/petstore/swift5/x-swift-hashable/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
@@ -64,7 +64,7 @@ public struct APIHelper {
 
     /// maps all values from source to query parameters
     ///
-    /// explode attribute is respected: collection values might be either joined or split up into seperate key value pairs
+    /// explode attribute is respected: collection values might be either joined or split up into separate key value pairs
     public static func mapValuesToQueryItems(_ source: [String: (wrappedValue: Any?, isExplode: Bool)]) -> [URLQueryItem]? {
         let destination = source.filter { $0.value.wrappedValue != nil }.reduce(into: [URLQueryItem]()) { result, item in
             if let collection = item.value.wrappedValue as? [Any?] {
diff --git a/samples/client/petstore/swift5/x-swift-hashable/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift5/x-swift-hashable/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index 93671ed852a9..fd939fc16925 100644
--- a/samples/client/petstore/swift5/x-swift-hashable/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/x-swift-hashable/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -247,7 +247,7 @@ open class PetAPI {
      - GET /pet/{petId}
      - Returns a single pet
      - API Key:
-       - type: apiKey api_key 
+       - type: apiKey api_key (HEADER)
        - name: api_key
      - parameter petId: (path) ID of pet to return 
      - returns: RequestBuilder 
diff --git a/samples/client/petstore/swift5/x-swift-hashable/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift5/x-swift-hashable/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
index c8416218db1c..ad60d97fa921 100644
--- a/samples/client/petstore/swift5/x-swift-hashable/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift5/x-swift-hashable/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
@@ -82,7 +82,7 @@ open class StoreAPI {
      - GET /store/inventory
      - Returns a map of status codes to quantities
      - API Key:
-       - type: apiKey api_key 
+       - type: apiKey api_key (HEADER)
        - name: api_key
      - returns: RequestBuilder<[String: Int]> 
      */
@@ -126,7 +126,7 @@ open class StoreAPI {
     /**
      Find purchase order by ID
      - GET /store/order/{order_id}
-     - For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     - For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      - parameter orderId: (path) ID of pet that needs to be fetched 
      - returns: RequestBuilder 
      */
diff --git a/samples/client/petstore/swift5/x-swift-hashable/docs/StoreAPI.md b/samples/client/petstore/swift5/x-swift-hashable/docs/StoreAPI.md
index b023aa9e4523..edb75e33b70b 100644
--- a/samples/client/petstore/swift5/x-swift-hashable/docs/StoreAPI.md
+++ b/samples/client/petstore/swift5/x-swift-hashable/docs/StoreAPI.md
@@ -113,7 +113,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```swift
diff --git a/samples/client/petstore/tiny/cpp/README.md b/samples/client/petstore/tiny/cpp/README.md
index e8bf721275b5..87027780c249 100644
--- a/samples/client/petstore/tiny/cpp/README.md
+++ b/samples/client/petstore/tiny/cpp/README.md
@@ -1,6 +1,6 @@
 # Documentation for OpenAPI Petstore
 This is a client generator for microcontrollers on the Espressif32 platform and the Arduino framework
-After the client have been generated, you have to change these following variablies:
+After the client have been generated, you have to change these following variables:
 - root.cert | Provide your service root certificate.
 - src/main.cpp | Change wifi name
 - src/main.cpp | Change wifi password
diff --git a/samples/client/petstore/tiny/cpp/lib/service/StoreApi.h b/samples/client/petstore/tiny/cpp/lib/service/StoreApi.h
index 1bf0db023737..3c347149c879 100644
--- a/samples/client/petstore/tiny/cpp/lib/service/StoreApi.h
+++ b/samples/client/petstore/tiny/cpp/lib/service/StoreApi.h
@@ -51,7 +51,7 @@ class StoreApi : public AbstractService {
     /**
     * Find purchase order by ID.
     *
-    * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
     * \param orderId ID of pet that needs to be fetched *Required*
     */
     Response<
diff --git a/samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/api/store.service.ts b/samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/api/store.service.ts
index 6160c6b7c266..bf6a3e9d4b14 100644
--- a/samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/api/store.service.ts
@@ -213,7 +213,7 @@ export class StoreService {
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
diff --git a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/api/store.service.ts b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/api/store.service.ts
index 374f8f02e751..e6256586bf9d 100644
--- a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/api/store.service.ts
@@ -213,7 +213,7 @@ export class StoreService {
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
diff --git a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/api/store.service.ts b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/api/store.service.ts
index 374f8f02e751..e6256586bf9d 100644
--- a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/api/store.service.ts
@@ -213,7 +213,7 @@ export class StoreService {
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
diff --git a/samples/client/petstore/typescript-angular-v12-provided-in-root/pom.xml b/samples/client/petstore/typescript-angular-v12-provided-in-root/pom.xml
index f7667cb436e5..66d05a023dbf 100644
--- a/samples/client/petstore/typescript-angular-v12-provided-in-root/pom.xml
+++ b/samples/client/petstore/typescript-angular-v12-provided-in-root/pom.xml
@@ -1,7 +1,7 @@
 
     4.0.0
     org.openapitools
-    TypeScriptAngular12PestoreClientTests
+    TypeScriptAngular12PetstoreClientTests
     pom
     1.0-SNAPSHOT
     TS Angular 12 Petstore Client Tests
diff --git a/samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default/api/store.service.ts b/samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default/api/store.service.ts
index 6160c6b7c266..bf6a3e9d4b14 100644
--- a/samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default/api/store.service.ts
@@ -213,7 +213,7 @@ export class StoreService {
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
diff --git a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/api/store.service.ts b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/api/store.service.ts
index 2aa584617fbb..47b3c2846541 100644
--- a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/api/store.service.ts
@@ -213,7 +213,7 @@ export class StoreService {
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
diff --git a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/api/store.service.ts b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/api/store.service.ts
index 2aa584617fbb..47b3c2846541 100644
--- a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/api/store.service.ts
@@ -213,7 +213,7 @@ export class StoreService {
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
diff --git a/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default/api/store.service.ts b/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default/api/store.service.ts
index 2aa584617fbb..47b3c2846541 100644
--- a/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default/api/store.service.ts
@@ -213,7 +213,7 @@ export class StoreService {
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
diff --git a/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/with-npm/api/store.service.ts b/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/with-npm/api/store.service.ts
index cc32a52fc4c7..2478a3d3b0e7 100644
--- a/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/with-npm/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/with-npm/api/store.service.ts
@@ -207,7 +207,7 @@ export class StoreService {
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
diff --git a/samples/client/petstore/typescript-angular-v14-query-param-object-format/api/store.service.ts b/samples/client/petstore/typescript-angular-v14-query-param-object-format/api/store.service.ts
index 04f78cae1c49..f2cd4b844fc4 100644
--- a/samples/client/petstore/typescript-angular-v14-query-param-object-format/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v14-query-param-object-format/api/store.service.ts
@@ -202,7 +202,7 @@ export class StoreService {
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
diff --git a/samples/client/petstore/typescript-aurelia/default/README.md b/samples/client/petstore/typescript-aurelia/default/README.md
index 39a6c22b2e20..1475a466d64a 100644
--- a/samples/client/petstore/typescript-aurelia/default/README.md
+++ b/samples/client/petstore/typescript-aurelia/default/README.md
@@ -27,7 +27,7 @@ npm run build
 ```
 
 #### NPM ####
-You may publish the module to NPM. In this case, you would be able to install the module as any other NPM module. It maybe useful to use [scoped packages](https://docs.npmjs.com/misc/scope).
+You may publish the module to NPM. In this case, you would be able to install the module as any other NPM module. It may be useful to use [scoped packages](https://docs.npmjs.com/misc/scope).
 
 You can also use `npm link` to link the module. However, this would not modify `package.json` of the installing project, as such you would need to relink every time you deploy that project. 
 
diff --git a/samples/client/petstore/typescript-aurelia/default/StoreApi.ts b/samples/client/petstore/typescript-aurelia/default/StoreApi.ts
index feaab4b09778..3d88a8211928 100644
--- a/samples/client/petstore/typescript-aurelia/default/StoreApi.ts
+++ b/samples/client/petstore/typescript-aurelia/default/StoreApi.ts
@@ -118,7 +118,7 @@ export class StoreApi extends Api {
 
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    * @param params.orderId ID of pet that needs to be fetched
    */
   async getOrderById(params: IGetOrderByIdParams): Promise {
diff --git a/samples/client/petstore/typescript-axios/builds/default/api.ts b/samples/client/petstore/typescript-axios/builds/default/api.ts
index 5d2454f32f82..5bebd4db3b9e 100644
--- a/samples/client/petstore/typescript-axios/builds/default/api.ts
+++ b/samples/client/petstore/typescript-axios/builds/default/api.ts
@@ -985,7 +985,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration
             };
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @param {number} orderId ID of pet that needs to be fetched
          * @param {*} [options] Override http request option.
@@ -1086,7 +1086,7 @@ export const StoreApiFp = function(configuration?: Configuration) {
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @param {number} orderId ID of pet that needs to be fetched
          * @param {*} [options] Override http request option.
@@ -1137,7 +1137,7 @@ export const StoreApiFactory = function (configuration?: Configuration, basePath
             return localVarFp.getInventory(options).then((request) => request(axios, basePath));
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @param {number} orderId ID of pet that needs to be fetched
          * @param {*} [options] Override http request option.
@@ -1190,7 +1190,7 @@ export class StoreApi extends BaseAPI {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @summary Find purchase order by ID
      * @param {number} orderId ID of pet that needs to be fetched
      * @param {*} [options] Override http request option.
diff --git a/samples/client/petstore/typescript-axios/builds/es6-target/api.ts b/samples/client/petstore/typescript-axios/builds/es6-target/api.ts
index 5d2454f32f82..5bebd4db3b9e 100644
--- a/samples/client/petstore/typescript-axios/builds/es6-target/api.ts
+++ b/samples/client/petstore/typescript-axios/builds/es6-target/api.ts
@@ -985,7 +985,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration
             };
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @param {number} orderId ID of pet that needs to be fetched
          * @param {*} [options] Override http request option.
@@ -1086,7 +1086,7 @@ export const StoreApiFp = function(configuration?: Configuration) {
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @param {number} orderId ID of pet that needs to be fetched
          * @param {*} [options] Override http request option.
@@ -1137,7 +1137,7 @@ export const StoreApiFactory = function (configuration?: Configuration, basePath
             return localVarFp.getInventory(options).then((request) => request(axios, basePath));
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @param {number} orderId ID of pet that needs to be fetched
          * @param {*} [options] Override http request option.
@@ -1190,7 +1190,7 @@ export class StoreApi extends BaseAPI {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @summary Find purchase order by ID
      * @param {number} orderId ID of pet that needs to be fetched
      * @param {*} [options] Override http request option.
diff --git a/samples/client/petstore/typescript-axios/builds/test-petstore/api.ts b/samples/client/petstore/typescript-axios/builds/test-petstore/api.ts
index 1400ca368613..fa769208e5c4 100644
--- a/samples/client/petstore/typescript-axios/builds/test-petstore/api.ts
+++ b/samples/client/petstore/typescript-axios/builds/test-petstore/api.ts
@@ -4201,7 +4201,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration
             };
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @param {number} orderId ID of pet that needs to be fetched
          * @param {*} [options] Override http request option.
@@ -4302,7 +4302,7 @@ export const StoreApiFp = function(configuration?: Configuration) {
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @param {number} orderId ID of pet that needs to be fetched
          * @param {*} [options] Override http request option.
@@ -4353,7 +4353,7 @@ export const StoreApiFactory = function (configuration?: Configuration, basePath
             return localVarFp.getInventory(options).then((request) => request(axios, basePath));
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @param {number} orderId ID of pet that needs to be fetched
          * @param {*} [options] Override http request option.
@@ -4406,7 +4406,7 @@ export class StoreApi extends BaseAPI {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @summary Find purchase order by ID
      * @param {number} orderId ID of pet that needs to be fetched
      * @param {*} [options] Override http request option.
diff --git a/samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts b/samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts
index db982733cdae..425fc0f4ea36 100644
--- a/samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts
@@ -1028,7 +1028,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration
             };
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @param {number} orderId ID of pet that needs to be fetched
          * @param {*} [options] Override http request option.
@@ -1129,7 +1129,7 @@ export const StoreApiFp = function(configuration?: Configuration) {
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @param {number} orderId ID of pet that needs to be fetched
          * @param {*} [options] Override http request option.
@@ -1180,7 +1180,7 @@ export const StoreApiFactory = function (configuration?: Configuration, basePath
             return localVarFp.getInventory(options).then((request) => request(axios, basePath));
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @param {number} orderId ID of pet that needs to be fetched
          * @param {*} [options] Override http request option.
@@ -1233,7 +1233,7 @@ export class StoreApi extends BaseAPI {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @summary Find purchase order by ID
      * @param {number} orderId ID of pet that needs to be fetched
      * @param {*} [options] Override http request option.
diff --git a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/api.ts b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/api.ts
index f5c539788083..90f71ba9ff58 100644
--- a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/api.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/api.ts
@@ -3846,7 +3846,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration
             };
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @param {number} orderId ID of pet that needs to be fetched
          * @param {*} [options] Override http request option.
@@ -3947,7 +3947,7 @@ export const StoreApiFp = function(configuration?: Configuration) {
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @param {number} orderId ID of pet that needs to be fetched
          * @param {*} [options] Override http request option.
@@ -3998,7 +3998,7 @@ export const StoreApiFactory = function (configuration?: Configuration, basePath
             return localVarFp.getInventory(options).then((request) => request(axios, basePath));
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @param {number} orderId ID of pet that needs to be fetched
          * @param {*} [options] Override http request option.
@@ -4051,7 +4051,7 @@ export class StoreApi extends BaseAPI {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @summary Find purchase order by ID
      * @param {number} orderId ID of pet that needs to be fetched
      * @param {*} [options] Override http request option.
diff --git a/samples/client/petstore/typescript-axios/builds/with-interfaces/api.ts b/samples/client/petstore/typescript-axios/builds/with-interfaces/api.ts
index 360b0bfcb957..1f7c23fddf25 100644
--- a/samples/client/petstore/typescript-axios/builds/with-interfaces/api.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-interfaces/api.ts
@@ -1079,7 +1079,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration
             };
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @param {number} orderId ID of pet that needs to be fetched
          * @param {*} [options] Override http request option.
@@ -1180,7 +1180,7 @@ export const StoreApiFp = function(configuration?: Configuration) {
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @param {number} orderId ID of pet that needs to be fetched
          * @param {*} [options] Override http request option.
@@ -1231,7 +1231,7 @@ export const StoreApiFactory = function (configuration?: Configuration, basePath
             return localVarFp.getInventory(options).then((request) => request(axios, basePath));
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @param {number} orderId ID of pet that needs to be fetched
          * @param {*} [options] Override http request option.
@@ -1279,7 +1279,7 @@ export interface StoreApiInterface {
     getInventory(options?: AxiosRequestConfig): AxiosPromise<{ [key: string]: number; }>;
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @summary Find purchase order by ID
      * @param {number} orderId ID of pet that needs to be fetched
      * @param {*} [options] Override http request option.
@@ -1331,7 +1331,7 @@ export class StoreApi extends BaseAPI implements StoreApiInterface {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @summary Find purchase order by ID
      * @param {number} orderId ID of pet that needs to be fetched
      * @param {*} [options] Override http request option.
diff --git a/samples/client/petstore/typescript-axios/builds/with-node-imports/api.ts b/samples/client/petstore/typescript-axios/builds/with-node-imports/api.ts
index db9e02261668..879b843a5ee2 100644
--- a/samples/client/petstore/typescript-axios/builds/with-node-imports/api.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-node-imports/api.ts
@@ -989,7 +989,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration
             };
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @param {number} orderId ID of pet that needs to be fetched
          * @param {*} [options] Override http request option.
@@ -1088,7 +1088,7 @@ export const StoreApiFp = function(configuration?: Configuration) {
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @param {number} orderId ID of pet that needs to be fetched
          * @param {*} [options] Override http request option.
@@ -1139,7 +1139,7 @@ export const StoreApiFactory = function (configuration?: Configuration, basePath
             return localVarFp.getInventory(options).then((request) => request(axios, basePath));
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @param {number} orderId ID of pet that needs to be fetched
          * @param {*} [options] Override http request option.
@@ -1192,7 +1192,7 @@ export class StoreApi extends BaseAPI {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @summary Find purchase order by ID
      * @param {number} orderId ID of pet that needs to be fetched
      * @param {*} [options] Override http request option.
diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/store-api.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/store-api.ts
index bf058d959f5c..19227a79b308 100644
--- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/store-api.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/store-api.ts
@@ -96,7 +96,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration
             };
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @param {number} orderId ID of pet that needs to be fetched
          * @param {*} [options] Override http request option.
@@ -197,7 +197,7 @@ export const StoreApiFp = function(configuration?: Configuration) {
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @param {number} orderId ID of pet that needs to be fetched
          * @param {*} [options] Override http request option.
@@ -248,7 +248,7 @@ export const StoreApiFactory = function (configuration?: Configuration, basePath
             return localVarFp.getInventory(options).then((request) => request(axios, basePath));
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @param {number} orderId ID of pet that needs to be fetched
          * @param {*} [options] Override http request option.
@@ -301,7 +301,7 @@ export class StoreApi extends BaseAPI {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @summary Find purchase order by ID
      * @param {number} orderId ID of pet that needs to be fetched
      * @param {*} [options] Override http request option.
diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version/api.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version/api.ts
index 5d2454f32f82..5bebd4db3b9e 100644
--- a/samples/client/petstore/typescript-axios/builds/with-npm-version/api.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-npm-version/api.ts
@@ -985,7 +985,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration
             };
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @param {number} orderId ID of pet that needs to be fetched
          * @param {*} [options] Override http request option.
@@ -1086,7 +1086,7 @@ export const StoreApiFp = function(configuration?: Configuration) {
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @param {number} orderId ID of pet that needs to be fetched
          * @param {*} [options] Override http request option.
@@ -1137,7 +1137,7 @@ export const StoreApiFactory = function (configuration?: Configuration, basePath
             return localVarFp.getInventory(options).then((request) => request(axios, basePath));
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @param {number} orderId ID of pet that needs to be fetched
          * @param {*} [options] Override http request option.
@@ -1190,7 +1190,7 @@ export class StoreApi extends BaseAPI {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @summary Find purchase order by ID
      * @param {number} orderId ID of pet that needs to be fetched
      * @param {*} [options] Override http request option.
diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version/pom.xml b/samples/client/petstore/typescript-axios/builds/with-npm-version/pom.xml
index 453d0ba34dff..6255ece5418d 100644
--- a/samples/client/petstore/typescript-axios/builds/with-npm-version/pom.xml
+++ b/samples/client/petstore/typescript-axios/builds/with-npm-version/pom.xml
@@ -1,7 +1,7 @@
 
     4.0.0
     org.openapitools
-    TSAxiosPestoreTests
+    TSAxiosPetstoreTests
     pom
     1.0-SNAPSHOT
     TS Axios Petstore Test Client
diff --git a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/api.ts b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/api.ts
index 08dc38e93d44..3de428e657a9 100644
--- a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/api.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/api.ts
@@ -1127,7 +1127,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration
             };
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @param {number} orderId ID of pet that needs to be fetched
          * @param {*} [options] Override http request option.
@@ -1226,7 +1226,7 @@ export const StoreApiFp = function(configuration?: Configuration) {
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @param {number} orderId ID of pet that needs to be fetched
          * @param {*} [options] Override http request option.
@@ -1277,7 +1277,7 @@ export const StoreApiFactory = function (configuration?: Configuration, basePath
             return localVarFp.getInventory(options).then((request) => request(axios, basePath));
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @param {number} orderId ID of pet that needs to be fetched
          * @param {*} [options] Override http request option.
@@ -1372,7 +1372,7 @@ export class StoreApi extends BaseAPI {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @summary Find purchase order by ID
      * @param {StoreApiGetOrderByIdRequest} requestParameters Request parameters.
      * @param {*} [options] Override http request option.
diff --git a/samples/client/petstore/typescript-axios/builds/with-string-enums/api.ts b/samples/client/petstore/typescript-axios/builds/with-string-enums/api.ts
index 2ef7ef2a8966..140bd02c74c8 100644
--- a/samples/client/petstore/typescript-axios/builds/with-string-enums/api.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-string-enums/api.ts
@@ -989,7 +989,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration
             };
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @param {number} orderId ID of pet that needs to be fetched
          * @param {*} [options] Override http request option.
@@ -1090,7 +1090,7 @@ export const StoreApiFp = function(configuration?: Configuration) {
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @param {number} orderId ID of pet that needs to be fetched
          * @param {*} [options] Override http request option.
@@ -1141,7 +1141,7 @@ export const StoreApiFactory = function (configuration?: Configuration, basePath
             return localVarFp.getInventory(options).then((request) => request(axios, basePath));
         },
         /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+         * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
          * @summary Find purchase order by ID
          * @param {number} orderId ID of pet that needs to be fetched
          * @param {*} [options] Override http request option.
@@ -1194,7 +1194,7 @@ export class StoreApi extends BaseAPI {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @summary Find purchase order by ID
      * @param {number} orderId ID of pet that needs to be fetched
      * @param {*} [options] Override http request option.
diff --git a/samples/client/petstore/typescript-axios/tests/default/pom.xml b/samples/client/petstore/typescript-axios/tests/default/pom.xml
index 49c179c809c9..62e700087e8c 100644
--- a/samples/client/petstore/typescript-axios/tests/default/pom.xml
+++ b/samples/client/petstore/typescript-axios/tests/default/pom.xml
@@ -1,7 +1,7 @@
 
     4.0.0
     org.openapitools
-    TypeScriptAxiosPestoreClientTests
+    TypeScriptAxiosPetstoreClientTests
     pom
     1.0-SNAPSHOT
     TS Axios Petstore Test Client
diff --git a/samples/client/petstore/typescript-fetch/builds/allOf-readonly/runtime.ts b/samples/client/petstore/typescript-fetch/builds/allOf-readonly/runtime.ts
index 04cb4f94cd7d..8e0b06dca685 100644
--- a/samples/client/petstore/typescript-fetch/builds/allOf-readonly/runtime.ts
+++ b/samples/client/petstore/typescript-fetch/builds/allOf-readonly/runtime.ts
@@ -146,7 +146,7 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
@@ -155,13 +155,13 @@ export class BaseAPI {
         };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/StoreApi.ts
index d2c11b37b084..a4bf1d0d37be 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/StoreApi.ts
@@ -103,7 +103,7 @@ export class StoreApi extends runtime.BaseAPI {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      */
     async getOrderByIdRaw(requestParameters: GetOrderByIdRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> {
@@ -126,7 +126,7 @@ export class StoreApi extends runtime.BaseAPI {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      */
     async getOrderById(requestParameters: GetOrderByIdRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise {
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/runtime.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/runtime.ts
index 99991b9321a4..2c942d95a3b4 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/runtime.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/runtime.ts
@@ -146,7 +146,7 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
@@ -155,13 +155,13 @@ export class BaseAPI {
         };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts
index 203c4b9627ae..8f9d34b114de 100644
--- a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts
@@ -103,7 +103,7 @@ export class StoreApi extends runtime.BaseAPI {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      */
     async getOrderByIdRaw(requestParameters: GetOrderByIdRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> {
@@ -126,7 +126,7 @@ export class StoreApi extends runtime.BaseAPI {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      */
     async getOrderById(requestParameters: GetOrderByIdRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise {
diff --git a/samples/client/petstore/typescript-fetch/builds/default/pom.xml b/samples/client/petstore/typescript-fetch/builds/default/pom.xml
index b40b83a0c751..60f2f11da1f4 100644
--- a/samples/client/petstore/typescript-fetch/builds/default/pom.xml
+++ b/samples/client/petstore/typescript-fetch/builds/default/pom.xml
@@ -1,7 +1,7 @@
 
     4.0.0
     org.openapitools
-    TypeScriptAngularBuildPestoreClientTests
+    TypeScriptAngularBuildPetstoreClientTests
     pom
     1.0-SNAPSHOT
     TS Fetch Default Petstore Client
diff --git a/samples/client/petstore/typescript-fetch/builds/default/runtime.ts b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts
index 2fea248ca7ae..166da7c38d42 100644
--- a/samples/client/petstore/typescript-fetch/builds/default/runtime.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts
@@ -146,7 +146,7 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
@@ -155,13 +155,13 @@ export class BaseAPI {
         };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
diff --git a/samples/client/petstore/typescript-fetch/builds/enum/runtime.ts b/samples/client/petstore/typescript-fetch/builds/enum/runtime.ts
index 0f47ce36bace..7ceb9c463d9b 100644
--- a/samples/client/petstore/typescript-fetch/builds/enum/runtime.ts
+++ b/samples/client/petstore/typescript-fetch/builds/enum/runtime.ts
@@ -146,7 +146,7 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
@@ -155,13 +155,13 @@ export class BaseAPI {
         };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/pom.xml b/samples/client/petstore/typescript-fetch/builds/es6-target/pom.xml
index 94a52e3749f2..ada9ef798883 100644
--- a/samples/client/petstore/typescript-fetch/builds/es6-target/pom.xml
+++ b/samples/client/petstore/typescript-fetch/builds/es6-target/pom.xml
@@ -1,7 +1,7 @@
 
     4.0.0
     org.openapitools
-    TypeScriptAngularBuildES6PestoreClientTests
+    TypeScriptAngularBuildES6PetstoreClientTests
     pom
     1.0-SNAPSHOT
     TS Fetch ES6 Petstore Client
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/StoreApi.ts
index 203c4b9627ae..8f9d34b114de 100644
--- a/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/StoreApi.ts
@@ -103,7 +103,7 @@ export class StoreApi extends runtime.BaseAPI {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      */
     async getOrderByIdRaw(requestParameters: GetOrderByIdRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> {
@@ -126,7 +126,7 @@ export class StoreApi extends runtime.BaseAPI {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      */
     async getOrderById(requestParameters: GetOrderByIdRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise {
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/runtime.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/runtime.ts
index 2fea248ca7ae..166da7c38d42 100644
--- a/samples/client/petstore/typescript-fetch/builds/es6-target/src/runtime.ts
+++ b/samples/client/petstore/typescript-fetch/builds/es6-target/src/runtime.ts
@@ -146,7 +146,7 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
@@ -155,13 +155,13 @@ export class BaseAPI {
         };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/StoreApi.ts
index d282329dafe5..2921f694301e 100644
--- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/StoreApi.ts
@@ -103,7 +103,7 @@ export class StoreApi extends runtime.BaseAPI {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      */
     async getOrderByIdRaw(requestParameters: GetOrderByIdRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> {
@@ -126,7 +126,7 @@ export class StoreApi extends runtime.BaseAPI {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      */
     async getOrderById(orderId: number, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise {
diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/pom.xml b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/pom.xml
index a6fc39c4f08d..45c1c96ef798 100644
--- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/pom.xml
+++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/pom.xml
@@ -1,7 +1,7 @@
 
     4.0.0
     org.openapitools
-    TypeScriptAngularBuildPestoreClientTests
+    TypeScriptAngularBuildPetstoreClientTests
     pom
     1.0-SNAPSHOT
     TS Fetch Multiple Parameters Petstore Client
diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/runtime.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/runtime.ts
index 2fea248ca7ae..166da7c38d42 100644
--- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/runtime.ts
+++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/runtime.ts
@@ -146,7 +146,7 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
@@ -155,13 +155,13 @@ export class BaseAPI {
         };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/pom.xml b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/pom.xml
index 35c073c7dcaf..1ddb5113ecf5 100644
--- a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/pom.xml
+++ b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/pom.xml
@@ -1,7 +1,7 @@
 
     4.0.0
     org.openapitools
-    TypeScriptFetchBuildPrefixParameterInterfacesPestoreClientTests
+    TypeScriptFetchBuildPrefixParameterInterfacesPetstoreClientTests
     pom
     1.0-SNAPSHOT
     TS Fetch Petstore Client (with namespacing for parameter interfaces)
diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/StoreApi.ts
index a25702974fe3..d14628028309 100644
--- a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/StoreApi.ts
@@ -103,7 +103,7 @@ export class StoreApi extends runtime.BaseAPI {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      */
     async getOrderByIdRaw(requestParameters: StoreApiGetOrderByIdRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> {
@@ -126,7 +126,7 @@ export class StoreApi extends runtime.BaseAPI {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      */
     async getOrderById(requestParameters: StoreApiGetOrderByIdRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise {
diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/runtime.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/runtime.ts
index 2fea248ca7ae..166da7c38d42 100644
--- a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/runtime.ts
+++ b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/runtime.ts
@@ -146,7 +146,7 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
@@ -155,13 +155,13 @@ export class BaseAPI {
         };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/StoreApi.ts
index d282329dafe5..2921f694301e 100644
--- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/StoreApi.ts
@@ -103,7 +103,7 @@ export class StoreApi extends runtime.BaseAPI {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      */
     async getOrderByIdRaw(requestParameters: GetOrderByIdRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> {
@@ -126,7 +126,7 @@ export class StoreApi extends runtime.BaseAPI {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      */
     async getOrderById(orderId: number, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise {
diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/runtime.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/runtime.ts
index 2fea248ca7ae..166da7c38d42 100644
--- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/runtime.ts
+++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/runtime.ts
@@ -146,7 +146,7 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
@@ -155,13 +155,13 @@ export class BaseAPI {
         };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts
index 614c70e6c1e0..b39dc4ca60d1 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts
@@ -73,7 +73,7 @@ export interface StoreApiInterface {
     getInventory(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<{ [key: string]: number; }>;
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @summary Find purchase order by ID
      * @param {number} orderId ID of pet that needs to be fetched
      * @param {*} [options] Override http request option.
@@ -83,7 +83,7 @@ export interface StoreApiInterface {
     getOrderByIdRaw(requestParameters: GetOrderByIdRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>;
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      */
     getOrderById(requestParameters: GetOrderByIdRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise;
@@ -174,7 +174,7 @@ export class StoreApi extends runtime.BaseAPI implements StoreApiInterface {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      */
     async getOrderByIdRaw(requestParameters: GetOrderByIdRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> {
@@ -197,7 +197,7 @@ export class StoreApi extends runtime.BaseAPI implements StoreApiInterface {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      */
     async getOrderById(requestParameters: GetOrderByIdRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise {
diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts
index 2fea248ca7ae..166da7c38d42 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts
@@ -146,7 +146,7 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
@@ -155,13 +155,13 @@ export class BaseAPI {
         };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/pom.xml b/samples/client/petstore/typescript-fetch/builds/with-npm-version/pom.xml
index 461175a4d677..9798b2989882 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/pom.xml
+++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/pom.xml
@@ -1,7 +1,7 @@
 
     4.0.0
     org.openapitools
-    TypeScriptAngularBuildWithNPMVersionPestoreClientTests
+    TypeScriptAngularBuildWithNPMVersionPetstoreClientTests
     pom
     1.0-SNAPSHOT
     TS Fetch Petstore Client (with npm)
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/StoreApi.ts
index 203c4b9627ae..8f9d34b114de 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/StoreApi.ts
@@ -103,7 +103,7 @@ export class StoreApi extends runtime.BaseAPI {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      */
     async getOrderByIdRaw(requestParameters: GetOrderByIdRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> {
@@ -126,7 +126,7 @@ export class StoreApi extends runtime.BaseAPI {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      */
     async getOrderById(requestParameters: GetOrderByIdRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise {
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/runtime.ts
index 2fea248ca7ae..166da7c38d42 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/runtime.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/runtime.ts
@@ -146,7 +146,7 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
@@ -155,13 +155,13 @@ export class BaseAPI {
         };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
diff --git a/samples/client/petstore/typescript-fetch/builds/with-string-enums/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-string-enums/runtime.ts
index 0f47ce36bace..7ceb9c463d9b 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-string-enums/runtime.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-string-enums/runtime.ts
@@ -146,7 +146,7 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
@@ -155,13 +155,13 @@ export class BaseAPI {
         };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
diff --git a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/StoreApi.ts
index 8b395b98280f..833d7f8440af 100644
--- a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/StoreApi.ts
@@ -99,7 +99,7 @@ export class StoreApi extends runtime.BaseAPI {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      */
     async getOrderByIdRaw(requestParameters: GetOrderByIdRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> {
@@ -122,7 +122,7 @@ export class StoreApi extends runtime.BaseAPI {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      */
     async getOrderById(requestParameters: GetOrderByIdRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise {
diff --git a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/runtime.ts b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/runtime.ts
index 80892c61073c..6da1edbcb72e 100644
--- a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/runtime.ts
+++ b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/runtime.ts
@@ -146,7 +146,7 @@ export class BaseAPI {
             credentials: this.configuration.credentials,
         };
 
-        const overridedInit: RequestInit = {
+        const overriddenInit: RequestInit = {
             ...initParams,
             ...(await initOverrideFn({
                 init: initParams,
@@ -155,13 +155,13 @@ export class BaseAPI {
         };
 
         const init: RequestInit = {
-            ...overridedInit,
+            ...overriddenInit,
             body:
-                isFormData(overridedInit.body) ||
-                overridedInit.body instanceof URLSearchParams ||
-                isBlob(overridedInit.body)
-                    ? overridedInit.body
-                    : JSON.stringify(overridedInit.body),
+                isFormData(overriddenInit.body) ||
+                overriddenInit.body instanceof URLSearchParams ||
+                isBlob(overriddenInit.body)
+                    ? overriddenInit.body
+                    : JSON.stringify(overriddenInit.body),
         };
 
         return { url, init };
diff --git a/samples/client/petstore/typescript-fetch/tests/default/pom.xml b/samples/client/petstore/typescript-fetch/tests/default/pom.xml
index 92063ea7bcc5..eeda8353ac00 100644
--- a/samples/client/petstore/typescript-fetch/tests/default/pom.xml
+++ b/samples/client/petstore/typescript-fetch/tests/default/pom.xml
@@ -1,7 +1,7 @@
 
     4.0.0
     org.openapitools
-    TypeScriptFetchPestoreClientTests
+    TypeScriptFetchPetstoreClientTests
     pom
     1.0-SNAPSHOT
     TS Fetch Petstore Test Client
diff --git a/samples/client/petstore/typescript-inversify/api/store.service.ts b/samples/client/petstore/typescript-inversify/api/store.service.ts
index 37db9280b1f2..3b7211032906 100644
--- a/samples/client/petstore/typescript-inversify/api/store.service.ts
+++ b/samples/client/petstore/typescript-inversify/api/store.service.ts
@@ -87,7 +87,7 @@ export class StoreService {
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      
      */
diff --git a/samples/client/petstore/typescript-jquery/default/api/StoreApi.ts b/samples/client/petstore/typescript-jquery/default/api/StoreApi.ts
index cf2b58ec9d9e..12daa011d6d0 100644
--- a/samples/client/petstore/typescript-jquery/default/api/StoreApi.ts
+++ b/samples/client/petstore/typescript-jquery/default/api/StoreApi.ts
@@ -169,7 +169,7 @@ export class StoreApi {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @summary Find purchase order by ID
      * @param orderId ID of pet that needs to be fetched
      */
diff --git a/samples/client/petstore/typescript-jquery/npm/api/StoreApi.ts b/samples/client/petstore/typescript-jquery/npm/api/StoreApi.ts
index cf2b58ec9d9e..12daa011d6d0 100644
--- a/samples/client/petstore/typescript-jquery/npm/api/StoreApi.ts
+++ b/samples/client/petstore/typescript-jquery/npm/api/StoreApi.ts
@@ -169,7 +169,7 @@ export class StoreApi {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @summary Find purchase order by ID
      * @param orderId ID of pet that needs to be fetched
      */
diff --git a/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api/store.service.ts b/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api/store.service.ts
index bed8d844524f..cb9192158366 100644
--- a/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api/store.service.ts
+++ b/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api/store.service.ts
@@ -110,7 +110,7 @@ export class StoreService {
     }
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
diff --git a/samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default/api/store.service.ts b/samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default/api/store.service.ts
index 29110b427e91..947bae1be177 100644
--- a/samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default/api/store.service.ts
+++ b/samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default/api/store.service.ts
@@ -111,7 +111,7 @@ export class StoreService {
     }
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
diff --git a/samples/client/petstore/typescript-node/default/api/storeApi.ts b/samples/client/petstore/typescript-node/default/api/storeApi.ts
index aa66df0b98a3..8cb4e74e842c 100644
--- a/samples/client/petstore/typescript-node/default/api/storeApi.ts
+++ b/samples/client/petstore/typescript-node/default/api/storeApi.ts
@@ -221,7 +221,7 @@ export class StoreApi {
         });
     }
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @summary Find purchase order by ID
      * @param orderId ID of pet that needs to be fetched
      */
diff --git a/samples/client/petstore/typescript-node/npm/api/storeApi.ts b/samples/client/petstore/typescript-node/npm/api/storeApi.ts
index aa66df0b98a3..8cb4e74e842c 100644
--- a/samples/client/petstore/typescript-node/npm/api/storeApi.ts
+++ b/samples/client/petstore/typescript-node/npm/api/storeApi.ts
@@ -221,7 +221,7 @@ export class StoreApi {
         });
     }
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @summary Find purchase order by ID
      * @param orderId ID of pet that needs to be fetched
      */
diff --git a/samples/client/petstore/typescript-node/npm/pom.xml b/samples/client/petstore/typescript-node/npm/pom.xml
index a69d53db3173..cbadc987eb58 100644
--- a/samples/client/petstore/typescript-node/npm/pom.xml
+++ b/samples/client/petstore/typescript-node/npm/pom.xml
@@ -1,7 +1,7 @@
 
     4.0.0
     org.openapitools
-    TypeScriptNodeNPMPestoreClientTests
+    TypeScriptNodeNPMPetstoreClientTests
     pom
     1.0-SNAPSHOT
     TS Node npm Petstore Client
diff --git a/samples/client/petstore/typescript-redux-query/builds/default/src/apis/StoreApi.ts b/samples/client/petstore/typescript-redux-query/builds/default/src/apis/StoreApi.ts
index b49ad469dda4..a9be7bb8961f 100644
--- a/samples/client/petstore/typescript-redux-query/builds/default/src/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-redux-query/builds/default/src/apis/StoreApi.ts
@@ -126,7 +126,7 @@ export function getInventory( requestConfig?: runtime.TypedQueryConfig 10. Other values will generated exceptions
+ * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
  * Find purchase order by ID
  */
 function getOrderByIdRaw(requestParameters: GetOrderByIdRequest, requestConfig: runtime.TypedQueryConfig = {}): QueryConfig {
@@ -166,7 +166,7 @@ function getOrderByIdRaw(requestParameters: GetOrderByIdRequest, requestConfi
 }
 
 /**
-* For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+* For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 * Find purchase order by ID
 */
 export function getOrderById(requestParameters: GetOrderByIdRequest, requestConfig?: runtime.TypedQueryConfig): QueryConfig {
diff --git a/samples/client/petstore/typescript-redux-query/builds/with-npm-version/src/apis/StoreApi.ts b/samples/client/petstore/typescript-redux-query/builds/with-npm-version/src/apis/StoreApi.ts
index b4802bdad501..ad509b371d49 100644
--- a/samples/client/petstore/typescript-redux-query/builds/with-npm-version/src/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-redux-query/builds/with-npm-version/src/apis/StoreApi.ts
@@ -125,7 +125,7 @@ export function getInventory( requestConfig?: runtime.TypedQueryConfig 10. Other values will generated exceptions
+ * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
  * Find purchase order by ID
  */
 function getOrderByIdRaw(requestParameters: GetOrderByIdRequest, requestConfig: runtime.TypedQueryConfig = {}): QueryConfig {
@@ -165,7 +165,7 @@ function getOrderByIdRaw(requestParameters: GetOrderByIdRequest, requestConfi
 }
 
 /**
-* For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+* For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 * Find purchase order by ID
 */
 export function getOrderById(requestParameters: GetOrderByIdRequest, requestConfig?: runtime.TypedQueryConfig): QueryConfig {
diff --git a/samples/client/petstore/typescript-rxjs/builds/default/apis/StoreApi.ts b/samples/client/petstore/typescript-rxjs/builds/default/apis/StoreApi.ts
index 4b41b2501af4..85dcd9aa568a 100644
--- a/samples/client/petstore/typescript-rxjs/builds/default/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/default/apis/StoreApi.ts
@@ -70,7 +70,7 @@ export class StoreApi extends BaseAPI {
     };
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      */
     getOrderById({ orderId }: GetOrderByIdRequest): Observable
diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/StoreApi.ts b/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/StoreApi.ts
index 4b41b2501af4..85dcd9aa568a 100644
--- a/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/StoreApi.ts
@@ -70,7 +70,7 @@ export class StoreApi extends BaseAPI {
     };
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      */
     getOrderById({ orderId }: GetOrderByIdRequest): Observable
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/StoreApi.ts b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/StoreApi.ts
index 4b41b2501af4..85dcd9aa568a 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/StoreApi.ts
@@ -70,7 +70,7 @@ export class StoreApi extends BaseAPI {
     };
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      */
     getOrderById({ orderId }: GetOrderByIdRequest): Observable
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/apis/StoreApi.ts b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/apis/StoreApi.ts
index fc5c271bc0ff..7d1a2bf2ca47 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/apis/StoreApi.ts
@@ -74,7 +74,7 @@ export class StoreApi extends BaseAPI {
     };
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      */
     getOrderById({ orderId }: GetOrderByIdRequest): Observable
diff --git a/samples/config/petstore/apache2/.openapi-generator-ignore b/samples/config/petstore/apache2/.openapi-generator-ignore
index c5fa491b4c55..deed424f8a15 100644
--- a/samples/config/petstore/apache2/.openapi-generator-ignore
+++ b/samples/config/petstore/apache2/.openapi-generator-ignore
@@ -5,7 +5,7 @@
 # The patterns follow closely to .gitignore or .dockerignore.
 
 # As an example, the C# client generator defines ApiClient.cs.
-# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+# You can make changes and tell Swagger Codegen to ignore just this file by uncommenting the following line:
 #ApiClient.cs
 
 # You can match any string of characters against a directory, file or extension with a single asterisk (*):
diff --git a/samples/config/petstore/graphql-schema/petstore/api/store_api.graphql b/samples/config/petstore/graphql-schema/petstore/api/store_api.graphql
index e65b6520bb27..091695d34ec0 100644
--- a/samples/config/petstore/graphql-schema/petstore/api/store_api.graphql
+++ b/samples/config/petstore/graphql-schema/petstore/api/store_api.graphql
@@ -29,7 +29,7 @@ type query {
   GetInventory(): Int!
 
   # Find purchase order by ID
-  # For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+  # For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
   # @param Int! orderId ID of pet that needs to be fetched
   # @return [Order]
   GetOrderById(orderId: Int!): Order
diff --git a/samples/config/petstore/protobuf-schema/README.md b/samples/config/petstore/protobuf-schema/README.md
index 1d3ea81c472d..84401dcdc783 100644
--- a/samples/config/petstore/protobuf-schema/README.md
+++ b/samples/config/petstore/protobuf-schema/README.md
@@ -16,9 +16,9 @@ Below are some usage examples for Go and Ruby. For other languages, please refer
 ### Go
 ```
 # assuming `protoc-gen-go` has been installed with `go get -u github.com/golang/protobuf/protoc-gen-go`
-mkdir /var/tmp/go/
-protoc --go_out=/var/tmp/go/ services/*
-protoc --go_out=/var/tmp/go/ models/*
+mkdir /var/tmp/go/petstore
+protoc --go_out=/var/tmp/go/petstore services/*
+protoc --go_out=/var/tmp/go/petstore models/*
 ```
 
 ### Ruby
diff --git a/samples/documentation/asciidoc/index.adoc b/samples/documentation/asciidoc/index.adoc
index bc9f84fa1f28..22da016110ea 100644
--- a/samples/documentation/asciidoc/index.adoc
+++ b/samples/documentation/asciidoc/index.adoc
@@ -951,7 +951,7 @@ Find purchase order by ID
 
 ===== Description 
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 
 // markup not found, no include::{specDir}store/order/\{orderId\}/GET/spec.adoc[opts=optional]
diff --git a/samples/documentation/cwiki/confluence-markup.txt b/samples/documentation/cwiki/confluence-markup.txt
index c895eeec3590..286bce5061b9 100644
--- a/samples/documentation/cwiki/confluence-markup.txt
+++ b/samples/documentation/cwiki/confluence-markup.txt
@@ -536,7 +536,7 @@ h4. Responses
 h3. getOrderById
 {panel:title=getOrderById|borderStyle=solid|borderColor=#003b6f|titleBGColor=#003b6f|titleColor=#a6b8c7|bgColor=#ffffff}
     *Summary:* Find purchase order by ID
-    *Description:* For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    *Description:* For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 	|| HttpMethod | {status:colour=Yellow|title=get|subtle=false} |
     || Protocol | {noformat:nopanel=true}http{noformat} |
diff --git a/samples/documentation/dynamic-html/docs/assets/css/style.css b/samples/documentation/dynamic-html/docs/assets/css/style.css
index b596c11a535f..62aa260ee914 100644
--- a/samples/documentation/dynamic-html/docs/assets/css/style.css
+++ b/samples/documentation/dynamic-html/docs/assets/css/style.css
@@ -78,7 +78,7 @@
   padding-bottom: 5px;
 }
 
-.model-detail-popup .param-reqiured-true {
+.model-detail-popup .param-required-true {
   font-family: monospace;
   font-weight: bold;
   clear: left;
diff --git a/samples/documentation/dynamic-html/docs/operations/StoreApi.html b/samples/documentation/dynamic-html/docs/operations/StoreApi.html
index cb880712d31a..4d2e230e28ce 100644
--- a/samples/documentation/dynamic-html/docs/operations/StoreApi.html
+++ b/samples/documentation/dynamic-html/docs/operations/StoreApi.html
@@ -42,7 +42,7 @@ 
Parameters

   
getOrderById

   

   

-  
For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions

+  
For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions

   
URL

   http://petstore.swagger.io/v2/store/order/{orderId}
   
HTTP Method

diff --git a/samples/documentation/html/index.html b/samples/documentation/html/index.html
index 2d744efa666b..c03786480365 100644
--- a/samples/documentation/html/index.html
+++ b/samples/documentation/html/index.html
@@ -847,7 +847,7 @@ 
200

     Up
     
get /store/order/{orderId}

     
Find purchase order by ID (getOrderById)

-    
For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions

+    
For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions

 
     
Path parameters

     

diff --git a/samples/documentation/html2/index.html b/samples/documentation/html2/index.html
index a40148036cbd..936065f37c79 100644
--- a/samples/documentation/html2/index.html
+++ b/samples/documentation/html2/index.html
@@ -5229,7 +5229,7 @@ 
getOrderById

                         

                         

                         

-                        
For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions

+                        
For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions

                         

                         

                         
/store/order/{orderId}

diff --git a/samples/documentation/markdown/Apis/StoreApi.md b/samples/documentation/markdown/Apis/StoreApi.md
index 4797be5c51eb..580c02354df4 100644
--- a/samples/documentation/markdown/Apis/StoreApi.md
+++ b/samples/documentation/markdown/Apis/StoreApi.md
@@ -67,7 +67,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-    For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Parameters
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/git_push.sh b/samples/openapi3/client/3_0_3_unit_test/python/git_push.sh
index ced3be2b0c7b..200e975d2120 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/git_push.sh
+++ b/samples/openapi3/client/3_0_3_unit_test/python/git_push.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update" "gitlab.com"
 
 git_user_id=$1
 git_repo_id=$2
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_models/test_object_properties_validation.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_models/test_object_properties_validation.py
index 9b74a32cc99d..d833889d0e18 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_models/test_object_properties_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_models/test_object_properties_validation.py
@@ -20,6 +20,17 @@ class TestObjectPropertiesValidation(unittest.TestCase):
     """ObjectPropertiesValidation unit test stubs"""
     _configuration = configuration.Configuration()
 
+    def test_doesnt_invalidate_other_properties_passes(self):
+        # doesn't invalidate other properties
+        ObjectPropertiesValidation.from_openapi_data_oapg(
+            {
+                "quux":
+                    [
+                    ],
+            },
+            _configuration=self._configuration
+        )
+
     def test_ignores_arrays_passes(self):
         # ignores arrays
         ObjectPropertiesValidation.from_openapi_data_oapg(
@@ -61,17 +72,6 @@ def test_both_properties_present_and_valid_is_valid_passes(self):
             _configuration=self._configuration
         )
 
-    def test_doesn_t_invalidate_other_properties_passes(self):
-        # doesn't invalidate other properties
-        ObjectPropertiesValidation.from_openapi_data_oapg(
-            {
-                "quux":
-                    [
-                    ],
-            },
-            _configuration=self._configuration
-        )
-
     def test_both_properties_invalid_is_invalid_fails(self):
         # both properties invalid is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_object_properties_validation_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_object_properties_validation_request_body/test_post.py
index 67fe785a8e40..adae606aa932 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_object_properties_validation_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_object_properties_validation_request_body/test_post.py
@@ -34,6 +34,40 @@ def tearDown(self):
     response_status = 200
     response_body = ''
 
+    def test_doesnt_invalidate_other_properties_passes(self):
+        content_type = 'application/json'
+        # doesn't invalidate other properties
+        with patch.object(urllib3.PoolManager, 'request') as mock_request:
+            payload = (
+                {
+                    "quux":
+                        [
+                        ],
+                }
+            )
+            body = post.SchemaForRequestBodyApplicationJson.from_openapi_data_oapg(
+                payload,
+                _configuration=self._configuration
+            )
+            mock_request.return_value = self.response(
+                self.json_bytes(self.response_body),
+                status=self.response_status
+            )
+            api_response = self.api.post(
+                body=body,
+                content_type=content_type
+            )
+            self.assert_pool_manager_request_called_with(
+                mock_request,
+                self._configuration.host + '/requestBody/postObjectPropertiesValidationRequestBody',
+                method='post'.upper(),
+                body=self.json_bytes(payload),
+                content_type=content_type,
+            )
+
+            assert isinstance(api_response.response, urllib3.HTTPResponse)
+            assert isinstance(api_response.body, schemas.Unset)
+
     def test_ignores_arrays_passes(self):
         content_type = 'application/json'
         # ignores arrays
@@ -150,40 +184,6 @@ def test_both_properties_present_and_valid_is_valid_passes(self):
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, schemas.Unset)
 
-    def test_doesn_t_invalidate_other_properties_passes(self):
-        content_type = 'application/json'
-        # doesn't invalidate other properties
-        with patch.object(urllib3.PoolManager, 'request') as mock_request:
-            payload = (
-                {
-                    "quux":
-                        [
-                        ],
-                }
-            )
-            body = post.SchemaForRequestBodyApplicationJson.from_openapi_data_oapg(
-                payload,
-                _configuration=self._configuration
-            )
-            mock_request.return_value = self.response(
-                self.json_bytes(self.response_body),
-                status=self.response_status
-            )
-            api_response = self.api.post(
-                body=body,
-                content_type=content_type
-            )
-            self.assert_pool_manager_request_called_with(
-                mock_request,
-                self._configuration.host + '/requestBody/postObjectPropertiesValidationRequestBody',
-                method='post'.upper(),
-                body=self.json_bytes(payload),
-                content_type=content_type,
-            )
-
-            assert isinstance(api_response.response, urllib3.HTTPResponse)
-            assert isinstance(api_response.body, schemas.Unset)
-
     def test_both_properties_invalid_is_invalid_fails(self):
         content_type = 'application/json'
         # both properties invalid is invalid
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_object_properties_validation_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_object_properties_validation_response_body_for_content_types/test_post.py
index 28b78c681627..e9064f7a8a5c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_object_properties_validation_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_object_properties_validation_response_body_for_content_types/test_post.py
@@ -33,6 +33,40 @@ def tearDown(self):
 
     response_status = 200
 
+    def test_doesnt_invalidate_other_properties_passes(self):
+        # doesn't invalidate other properties
+        accept_content_type = 'application/json'
+
+        with patch.object(urllib3.PoolManager, 'request') as mock_request:
+            payload = (
+                {
+                    "quux":
+                        [
+                        ],
+                }
+            )
+            mock_request.return_value = self.response(
+                self.json_bytes(payload),
+                status=self.response_status
+            )
+            api_response = self.api.post(
+                accept_content_types=(accept_content_type,)
+            )
+            self.assert_pool_manager_request_called_with(
+                mock_request,
+                self._configuration.host + '/responseBody/postObjectPropertiesValidationResponseBodyForContentTypes',
+                method='post'.upper(),
+                accept_content_type=accept_content_type,
+            )
+
+            assert isinstance(api_response.response, urllib3.HTTPResponse)
+            assert isinstance(api_response.body, post.SchemaFor200ResponseBodyApplicationJson)
+            deserialized_response_body = post.SchemaFor200ResponseBodyApplicationJson.from_openapi_data_oapg(
+                payload,
+                _configuration=self._configuration
+            )
+            assert api_response.body == deserialized_response_body
+
     def test_ignores_arrays_passes(self):
         # ignores arrays
         accept_content_type = 'application/json'
@@ -159,40 +193,6 @@ def test_both_properties_present_and_valid_is_valid_passes(self):
             )
             assert api_response.body == deserialized_response_body
 
-    def test_doesn_t_invalidate_other_properties_passes(self):
-        # doesn't invalidate other properties
-        accept_content_type = 'application/json'
-
-        with patch.object(urllib3.PoolManager, 'request') as mock_request:
-            payload = (
-                {
-                    "quux":
-                        [
-                        ],
-                }
-            )
-            mock_request.return_value = self.response(
-                self.json_bytes(payload),
-                status=self.response_status
-            )
-            api_response = self.api.post(
-                accept_content_types=(accept_content_type,)
-            )
-            self.assert_pool_manager_request_called_with(
-                mock_request,
-                self._configuration.host + '/responseBody/postObjectPropertiesValidationResponseBodyForContentTypes',
-                method='post'.upper(),
-                accept_content_type=accept_content_type,
-            )
-
-            assert isinstance(api_response.response, urllib3.HTTPResponse)
-            assert isinstance(api_response.body, post.SchemaFor200ResponseBodyApplicationJson)
-            deserialized_response_body = post.SchemaFor200ResponseBodyApplicationJson.from_openapi_data_oapg(
-                payload,
-                _configuration=self._configuration
-            )
-            assert api_response.body == deserialized_response_body
-
     def test_both_properties_invalid_is_invalid_fails(self):
         # both properties invalid is invalid
         accept_content_type = 'application/json'
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/models/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/models/__init__.py
index 3dd512a4cd2e..aac639450c1c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/models/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/models/__init__.py
@@ -6,7 +6,7 @@
 # if you have many models here with many references from one model to another this may
 # raise a RecursionError
 # to avoid this, import only the models that you directly need like:
-# from from unit_test_api.model.pet import Pet
+# from unit_test_api.model.pet import Pet
 # or import this package, but before doing it, use:
 # import sys
 # sys.setrecursionlimit(n)
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/schemas.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/schemas.py
index c9fe4b6fecf5..e76f2b13dcbd 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/schemas.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/schemas.py
@@ -385,7 +385,7 @@ def __get_new_cls(
             _validate_oapg returns a key value pair
             where the key is the path to the item, and the value will be the required manufactured class
             made out of the matching schemas
-        2. value is an instance of the the correct schema type
+        2. value is an instance of the correct schema type
             the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
             for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
             and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
@@ -868,7 +868,7 @@ def _is_json_validation_enabled_oapg(schema_keyword, configuration=None):
             schema_keyword not in configuration._disabled_client_side_validations)
 
     @staticmethod
-    def _raise_validation_errror_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=""):
+    def _raise_validation_error_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=""):
         raise ApiValueError(
             "Invalid value `{value}`, {constraint_msg} `{constraint_value}`{additional_txt} at {path_to_item}".format(
                 value=value,
@@ -963,7 +963,7 @@ def __check_str_validations(
         if (cls._is_json_validation_enabled_oapg('maxLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_length') and
                 len(arg) > cls.MetaOapg.max_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="length must be less than or equal to",
                 constraint_value=cls.MetaOapg.max_length,
@@ -973,7 +973,7 @@ def __check_str_validations(
         if (cls._is_json_validation_enabled_oapg('minLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_length') and
                 len(arg) < cls.MetaOapg.min_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="length must be greater than or equal to",
                 constraint_value=cls.MetaOapg.min_length,
@@ -988,14 +988,14 @@ def __check_str_validations(
                     if flags != 0:
                         # Don't print the regex flags if the flags are not
                         # specified in the OAS document.
-                        cls._raise_validation_errror_message_oapg(
+                        cls._raise_validation_error_message_oapg(
                             value=arg,
                             constraint_msg="must match regular expression",
                             constraint_value=regex_dict['pattern'],
                             path_to_item=validation_metadata.path_to_item,
                             additional_txt=" with flags=`{}`".format(flags)
                         )
-                    cls._raise_validation_errror_message_oapg(
+                    cls._raise_validation_error_message_oapg(
                         value=arg,
                         constraint_msg="must match regular expression",
                         constraint_value=regex_dict['pattern'],
@@ -1211,7 +1211,7 @@ def as_float_oapg(self) -> float:
             return self._as_float
         except AttributeError:
             if self.as_tuple().exponent >= 0:
-                raise ApiValueError(f'{self} is not an float')
+                raise ApiValueError(f'{self} is not a float')
             self._as_float = float(self)
             return self._as_float
 
@@ -1228,7 +1228,7 @@ def __check_numeric_validations(
             multiple_of_value = cls.MetaOapg.multiple_of
             if (not (float(arg) / multiple_of_value).is_integer()):
                 # Note 'multipleOf' will be as good as the floating point arithmetic.
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg="value must be a multiple of",
                     constraint_value=multiple_of_value,
@@ -1249,7 +1249,7 @@ def __check_numeric_validations(
         if (cls._is_json_validation_enabled_oapg('exclusiveMaximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_maximum') and
                 arg >= cls.MetaOapg.exclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="must be a value less than",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -1259,7 +1259,7 @@ def __check_numeric_validations(
         if (cls._is_json_validation_enabled_oapg('maximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_maximum') and
                 arg > cls.MetaOapg.inclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="must be a value less than or equal to",
                 constraint_value=cls.MetaOapg.inclusive_maximum,
@@ -1269,7 +1269,7 @@ def __check_numeric_validations(
         if (cls._is_json_validation_enabled_oapg('exclusiveMinimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_minimum') and
                 arg <= cls.MetaOapg.exclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="must be a value greater than",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -1279,7 +1279,7 @@ def __check_numeric_validations(
         if (cls._is_json_validation_enabled_oapg('minimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_minimum') and
                 arg < cls.MetaOapg.inclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="must be a value greater than or equal to",
                 constraint_value=cls.MetaOapg.inclusive_minimum,
@@ -1347,7 +1347,7 @@ def __check_tuple_validations(
         if (cls._is_json_validation_enabled_oapg('maxItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_items') and
                 len(arg) > cls.MetaOapg.max_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="number of items must be less than or equal to",
                 constraint_value=cls.MetaOapg.max_items,
@@ -1357,7 +1357,7 @@ def __check_tuple_validations(
         if (cls._is_json_validation_enabled_oapg('minItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_items') and
                 len(arg) < cls.MetaOapg.min_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="number of items must be greater than or equal to",
                 constraint_value=cls.MetaOapg.min_items,
@@ -1368,7 +1368,7 @@ def __check_tuple_validations(
                 hasattr(cls.MetaOapg, 'unique_items') and cls.MetaOapg.unique_items and arg):
             unique_items = set(arg)
             if len(arg) > len(unique_items):
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg="duplicate items were found, and the tuple must not contain duplicates because",
                     constraint_value='unique_items==True',
@@ -1611,7 +1611,7 @@ def __check_dict_validations(
         if (cls._is_json_validation_enabled_oapg('maxProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_properties') and
                 len(arg) > cls.MetaOapg.max_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="number of properties must be less than or equal to",
                 constraint_value=cls.MetaOapg.max_properties,
@@ -1621,7 +1621,7 @@ def __check_dict_validations(
         if (cls._is_json_validation_enabled_oapg('minProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_properties') and
                 len(arg) < cls.MetaOapg.min_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="number of properties must be greater than or equal to",
                 constraint_value=cls.MetaOapg.min_properties,
diff --git a/samples/openapi3/client/elm/src/Api/Data.elm b/samples/openapi3/client/elm/src/Api/Data.elm
index df7113ce37b7..200e64e42c37 100644
--- a/samples/openapi3/client/elm/src/Api/Data.elm
+++ b/samples/openapi3/client/elm/src/Api/Data.elm
@@ -91,7 +91,7 @@ type alias Absent =
 type alias Array =
     { array : List (String)
     , arrayOfArray : List (List (String))
-    , arrayOfPrimitve : Maybe (List (Primitive))
+    , arrayOfPrimitive : Maybe (List (Primitive))
     , arrayOfEnum : Maybe (List (Enum))
     }
 
@@ -297,7 +297,7 @@ encodeArrayPairs model =
         pairs =
             [ encode "array" (Json.Encode.list Json.Encode.string) model.array
             , encode "arrayOfArray" (Json.Encode.list (Json.Encode.list Json.Encode.string)) model.arrayOfArray
-            , maybeEncode "arrayOfPrimitve" (Json.Encode.list encodePrimitive) model.arrayOfPrimitve
+            , maybeEncode "arrayOfPrimitive" (Json.Encode.list encodePrimitive) model.arrayOfPrimitive
             , maybeEncode "arrayOfEnum" (Json.Encode.list encodeEnum) model.arrayOfEnum
             ]
     in
@@ -646,7 +646,7 @@ arrayDecoder =
     Json.Decode.succeed Array
         |> decode "array" (Json.Decode.list Json.Decode.string) 
         |> decode "arrayOfArray" (Json.Decode.list (Json.Decode.list Json.Decode.string)) 
-        |> maybeDecode "arrayOfPrimitve" (Json.Decode.list primitiveDecoder) Nothing
+        |> maybeDecode "arrayOfPrimitive" (Json.Decode.list primitiveDecoder) Nothing
         |> maybeDecode "arrayOfEnum" (Json.Decode.list enumDecoder) Nothing
 
 
diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/python-prior/x_auth_id_alias/models/__init__.py b/samples/openapi3/client/extensions/x-auth-id-alias/python-prior/x_auth_id_alias/models/__init__.py
index a3ebc1dedacf..a7f55b975995 100644
--- a/samples/openapi3/client/extensions/x-auth-id-alias/python-prior/x_auth_id_alias/models/__init__.py
+++ b/samples/openapi3/client/extensions/x-auth-id-alias/python-prior/x_auth_id_alias/models/__init__.py
@@ -4,7 +4,7 @@
 # if you have many models here with many references from one model to another this may
 # raise a RecursionError
 # to avoid this, import only the models that you directly need like:
-# from from x_auth_id_alias.model.pet import Pet
+# from x_auth_id_alias.model.pet import Pet
 # or import this package, but before doing it, use:
 # import sys
 # sys.setrecursionlimit(n)
diff --git a/samples/openapi3/client/features/dynamic-servers/python/dynamic_servers/models/__init__.py b/samples/openapi3/client/features/dynamic-servers/python/dynamic_servers/models/__init__.py
index 0cb2976e7c10..c69293a5b5d6 100644
--- a/samples/openapi3/client/features/dynamic-servers/python/dynamic_servers/models/__init__.py
+++ b/samples/openapi3/client/features/dynamic-servers/python/dynamic_servers/models/__init__.py
@@ -6,7 +6,7 @@
 # if you have many models here with many references from one model to another this may
 # raise a RecursionError
 # to avoid this, import only the models that you directly need like:
-# from from dynamic_servers.model.pet import Pet
+# from dynamic_servers.model.pet import Pet
 # or import this package, but before doing it, use:
 # import sys
 # sys.setrecursionlimit(n)
diff --git a/samples/openapi3/client/features/dynamic-servers/python/dynamic_servers/schemas.py b/samples/openapi3/client/features/dynamic-servers/python/dynamic_servers/schemas.py
index 3678a8294546..c0641412cb19 100644
--- a/samples/openapi3/client/features/dynamic-servers/python/dynamic_servers/schemas.py
+++ b/samples/openapi3/client/features/dynamic-servers/python/dynamic_servers/schemas.py
@@ -385,7 +385,7 @@ def __get_new_cls(
             _validate_oapg returns a key value pair
             where the key is the path to the item, and the value will be the required manufactured class
             made out of the matching schemas
-        2. value is an instance of the the correct schema type
+        2. value is an instance of the correct schema type
             the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
             for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
             and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
@@ -868,7 +868,7 @@ def _is_json_validation_enabled_oapg(schema_keyword, configuration=None):
             schema_keyword not in configuration._disabled_client_side_validations)
 
     @staticmethod
-    def _raise_validation_errror_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=""):
+    def _raise_validation_error_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=""):
         raise ApiValueError(
             "Invalid value `{value}`, {constraint_msg} `{constraint_value}`{additional_txt} at {path_to_item}".format(
                 value=value,
@@ -963,7 +963,7 @@ def __check_str_validations(
         if (cls._is_json_validation_enabled_oapg('maxLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_length') and
                 len(arg) > cls.MetaOapg.max_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="length must be less than or equal to",
                 constraint_value=cls.MetaOapg.max_length,
@@ -973,7 +973,7 @@ def __check_str_validations(
         if (cls._is_json_validation_enabled_oapg('minLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_length') and
                 len(arg) < cls.MetaOapg.min_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="length must be greater than or equal to",
                 constraint_value=cls.MetaOapg.min_length,
@@ -988,14 +988,14 @@ def __check_str_validations(
                     if flags != 0:
                         # Don't print the regex flags if the flags are not
                         # specified in the OAS document.
-                        cls._raise_validation_errror_message_oapg(
+                        cls._raise_validation_error_message_oapg(
                             value=arg,
                             constraint_msg="must match regular expression",
                             constraint_value=regex_dict['pattern'],
                             path_to_item=validation_metadata.path_to_item,
                             additional_txt=" with flags=`{}`".format(flags)
                         )
-                    cls._raise_validation_errror_message_oapg(
+                    cls._raise_validation_error_message_oapg(
                         value=arg,
                         constraint_msg="must match regular expression",
                         constraint_value=regex_dict['pattern'],
@@ -1211,7 +1211,7 @@ def as_float_oapg(self) -> float:
             return self._as_float
         except AttributeError:
             if self.as_tuple().exponent >= 0:
-                raise ApiValueError(f'{self} is not an float')
+                raise ApiValueError(f'{self} is not a float')
             self._as_float = float(self)
             return self._as_float
 
@@ -1228,7 +1228,7 @@ def __check_numeric_validations(
             multiple_of_value = cls.MetaOapg.multiple_of
             if (not (float(arg) / multiple_of_value).is_integer()):
                 # Note 'multipleOf' will be as good as the floating point arithmetic.
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg="value must be a multiple of",
                     constraint_value=multiple_of_value,
@@ -1249,7 +1249,7 @@ def __check_numeric_validations(
         if (cls._is_json_validation_enabled_oapg('exclusiveMaximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_maximum') and
                 arg >= cls.MetaOapg.exclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="must be a value less than",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -1259,7 +1259,7 @@ def __check_numeric_validations(
         if (cls._is_json_validation_enabled_oapg('maximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_maximum') and
                 arg > cls.MetaOapg.inclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="must be a value less than or equal to",
                 constraint_value=cls.MetaOapg.inclusive_maximum,
@@ -1269,7 +1269,7 @@ def __check_numeric_validations(
         if (cls._is_json_validation_enabled_oapg('exclusiveMinimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_minimum') and
                 arg <= cls.MetaOapg.exclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="must be a value greater than",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -1279,7 +1279,7 @@ def __check_numeric_validations(
         if (cls._is_json_validation_enabled_oapg('minimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_minimum') and
                 arg < cls.MetaOapg.inclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="must be a value greater than or equal to",
                 constraint_value=cls.MetaOapg.inclusive_minimum,
@@ -1347,7 +1347,7 @@ def __check_tuple_validations(
         if (cls._is_json_validation_enabled_oapg('maxItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_items') and
                 len(arg) > cls.MetaOapg.max_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="number of items must be less than or equal to",
                 constraint_value=cls.MetaOapg.max_items,
@@ -1357,7 +1357,7 @@ def __check_tuple_validations(
         if (cls._is_json_validation_enabled_oapg('minItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_items') and
                 len(arg) < cls.MetaOapg.min_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="number of items must be greater than or equal to",
                 constraint_value=cls.MetaOapg.min_items,
@@ -1368,7 +1368,7 @@ def __check_tuple_validations(
                 hasattr(cls.MetaOapg, 'unique_items') and cls.MetaOapg.unique_items and arg):
             unique_items = set(arg)
             if len(arg) > len(unique_items):
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg="duplicate items were found, and the tuple must not contain duplicates because",
                     constraint_value='unique_items==True',
@@ -1611,7 +1611,7 @@ def __check_dict_validations(
         if (cls._is_json_validation_enabled_oapg('maxProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_properties') and
                 len(arg) > cls.MetaOapg.max_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="number of properties must be less than or equal to",
                 constraint_value=cls.MetaOapg.max_properties,
@@ -1621,7 +1621,7 @@ def __check_dict_validations(
         if (cls._is_json_validation_enabled_oapg('minProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_properties') and
                 len(arg) < cls.MetaOapg.min_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="number of properties must be greater than or equal to",
                 constraint_value=cls.MetaOapg.min_properties,
diff --git a/samples/openapi3/client/features/dynamic-servers/python/git_push.sh b/samples/openapi3/client/features/dynamic-servers/python/git_push.sh
index ced3be2b0c7b..200e975d2120 100644
--- a/samples/openapi3/client/features/dynamic-servers/python/git_push.sh
+++ b/samples/openapi3/client/features/dynamic-servers/python/git_push.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update" "gitlab.com"
 
 git_user_id=$1
 git_repo_id=$2
diff --git a/samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/lib/src/model/addressable.dart b/samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/lib/src/model/addressable.dart
index e0311b6595b1..0ab0936d5673 100644
--- a/samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/lib/src/model/addressable.dart
+++ b/samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/lib/src/model/addressable.dart
@@ -8,7 +8,7 @@ import 'package:built_value/serializer.dart';
 
 part 'addressable.g.dart';
 
-/// Base schema for adressable entities
+/// Base schema for addressable entities
 ///
 /// Properties:
 /// * [href] - Hyperlink reference
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/StoreApi.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/StoreApi.md
index a25dc85408db..920e5a8d7b1d 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/StoreApi.md
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/StoreApi.md
@@ -105,7 +105,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```dart
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/api/store_api.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/api/store_api.dart
index 5712d8c03cf9..a2abc20e3b3a 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/api/store_api.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/api/store_api.dart
@@ -139,7 +139,7 @@ _responseData = deserialize, int>(_response.data!, 'Map 10. Other values will generated exceptions
+    // For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
     //
     //Future getOrderById(int orderId) async
     test('test getOrderById', () async {
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/StoreApi.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/StoreApi.md
index 6094dcc40182..b46dc95a5ec1 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/StoreApi.md
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/StoreApi.md
@@ -105,7 +105,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```dart
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/api/store_api.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/api/store_api.dart
index 93d5ccbe97cc..f3e847156e60 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/api/store_api.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/api/store_api.dart
@@ -145,7 +145,7 @@ class StoreApi {
   }
 
   /// Find purchase order by ID
-  /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+  /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
   ///
   /// Parameters:
   /// * [orderId] - ID of pet that needs to be fetched
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/store_api_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/store_api_test.dart
index b3afe7ca1e8f..77b3d9f00224 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/store_api_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/store_api_test.dart
@@ -27,7 +27,7 @@ void main() {
 
     // Find purchase order by ID
     //
-    // For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    // For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
     //
     //Future getOrderById(int orderId) async
     test('test getOrderById', () async {
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib/doc/StoreApi.md b/samples/openapi3/client/petstore/dart2/petstore_client_lib/doc/StoreApi.md
index 60f1f4d6f205..e52308617644 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib/doc/StoreApi.md
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib/doc/StoreApi.md
@@ -105,7 +105,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```dart
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api/store_api.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api/store_api.dart
index db1ac1f010bf..3378d2f635af 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api/store_api.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api/store_api.dart
@@ -117,7 +117,7 @@ class StoreApi {
 
   /// Find purchase order by ID
   ///
-  /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+  /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -153,7 +153,7 @@ class StoreApi {
 
   /// Find purchase order by ID
   ///
-  /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+  /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
   ///
   /// Parameters:
   ///
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib/test/store_api_test.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib/test/store_api_test.dart
index 351ef2682801..4d6825e2cfd1 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib/test/store_api_test.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib/test/store_api_test.dart
@@ -38,7 +38,7 @@ void main() {
 
     // Find purchase order by ID
     //
-    // For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    // For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
     //
     //Future getOrderById(int orderId) async
     test('test getOrderById', () async {
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/StoreApi.md b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/StoreApi.md
index 925f08c72d0b..d91bad051601 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/StoreApi.md
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/StoreApi.md
@@ -105,7 +105,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```dart
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api/store_api.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api/store_api.dart
index 68c1c9fdccb9..1d666113cf72 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api/store_api.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api/store_api.dart
@@ -117,7 +117,7 @@ class StoreApi {
 
   /// Find purchase order by ID
   ///
-  /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+  /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -153,7 +153,7 @@ class StoreApi {
 
   /// Find purchase order by ID
   ///
-  /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+  /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
   ///
   /// Parameters:
   ///
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/store_api_test.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/store_api_test.dart
index 351ef2682801..4d6825e2cfd1 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/store_api_test.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/store_api_test.dart
@@ -38,7 +38,7 @@ void main() {
 
     // Find purchase order by ID
     //
-    // For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    // For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
     //
     //Future getOrderById(int orderId) async
     test('test getOrderById', () async {
diff --git a/samples/openapi3/client/petstore/elm/src/Request/Store.elm b/samples/openapi3/client/petstore/elm/src/Request/Store.elm
index e2a40d41938e..fca396829b09 100644
--- a/samples/openapi3/client/petstore/elm/src/Request/Store.elm
+++ b/samples/openapi3/client/petstore/elm/src/Request/Store.elm
@@ -76,7 +76,7 @@ getInventory params =
         }
 
 
-{-| For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+{-| For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 -}
 getOrderById :
     { onSend : Result Http.Error Order_ -> msg
diff --git a/samples/openapi3/client/petstore/go/go-petstore/api/openapi.yaml b/samples/openapi3/client/petstore/go/go-petstore/api/openapi.yaml
index 71097efe090c..8ce9c146b7fd 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/api/openapi.yaml
+++ b/samples/openapi3/client/petstore/go/go-petstore/api/openapi.yaml
@@ -381,7 +381,7 @@ paths:
       - store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -666,13 +666,13 @@ paths:
         style: form
       responses:
         "400":
-          description: Someting wrong
+          description: Something wrong
         "5XX":
           content:
             applicatino/json:
               schema:
                 $ref: '#/components/schemas/OuterNumber'
-          description: Someting wrong
+          description: Something wrong
       security:
       - bearer_test: []
       summary: Fake endpoint to test group parameters (optional)
diff --git a/samples/openapi3/client/petstore/go/go-petstore/api_store.go b/samples/openapi3/client/petstore/go/go-petstore/api_store.go
index a33165238663..87abefe63618 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/api_store.go
+++ b/samples/openapi3/client/petstore/go/go-petstore/api_store.go
@@ -53,7 +53,7 @@ type StoreApi interface {
 	/*
 	GetOrderById Find purchase order by ID
 
-	For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+	For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
 	@param orderId ID of pet that needs to be fetched
@@ -301,7 +301,7 @@ func (r ApiGetOrderByIdRequest) Execute() (*Order, *http.Response, error) {
 /*
 GetOrderById Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
  @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
  @param orderId ID of pet that needs to be fetched
diff --git a/samples/openapi3/client/petstore/go/http_signature_test.go b/samples/openapi3/client/petstore/go/http_signature_test.go
index 492de97b5255..c1118e95639a 100644
--- a/samples/openapi3/client/petstore/go/http_signature_test.go
+++ b/samples/openapi3/client/petstore/go/http_signature_test.go
@@ -157,7 +157,7 @@ func writeRandomTestEcdsaPemKey(t *testing.T, filePath string) {
 
 // TestHttpSignaturePrivateKeys creates private keys of various sizes, serialization format,
 // clear-text and password encrypted.
-// Test unmarshaling of the private key.
+// Test unmarshalling of the private key.
 func TestHttpSignaturePrivateKeys(t *testing.T) {
 	var err error
 	var dir string
diff --git a/samples/openapi3/client/petstore/go/model_test.go b/samples/openapi3/client/petstore/go/model_test.go
index 0d7035eec85a..108a961eb1b6 100644
--- a/samples/openapi3/client/petstore/go/model_test.go
+++ b/samples/openapi3/client/petstore/go/model_test.go
@@ -17,7 +17,7 @@ func TestBanana(t *testing.T) {
 	newBanana.LengthCm = &lengthCm2
 	assert.Equal(newBanana.LengthCm, &lengthCm2, "Banana LengthCm should be equal")
 
-	// test additioanl properties
+	// test additional properties
 	jsonBanana := `{"fruits":["apple","peach"],"lengthCm":3.1}`
 	jsonMap := make(map[string]interface{})
 	json.Unmarshal([]byte(jsonBanana), &jsonMap)
@@ -26,7 +26,7 @@ func TestBanana(t *testing.T) {
 	lengthCm3 := float32(3.1)
 	json.Unmarshal([]byte(jsonBanana), &newBanana2)
 	assert.Equal(newBanana2.LengthCm, &lengthCm3, "Banana2 LengthCm should be equal")
-	assert.Equal(newBanana2.AdditionalProperties["fruits"], jsonMap["fruits"], "Banana2 AdditonalProperties should be equal")
+	assert.Equal(newBanana2.AdditionalProperties["fruits"], jsonMap["fruits"], "Banana2 AdditionalProperties should be equal")
 
 	newBanana2Json, _ := json.Marshal(newBanana2)
 	assert.Equal(string(newBanana2Json), jsonBanana, "Banana2 JSON string should be equal")
diff --git a/samples/openapi3/client/petstore/go/user_api_test.go b/samples/openapi3/client/petstore/go/user_api_test.go
index 757ac0fa9723..10bebdf7acc6 100644
--- a/samples/openapi3/client/petstore/go/user_api_test.go
+++ b/samples/openapi3/client/petstore/go/user_api_test.go
@@ -132,7 +132,7 @@ func TestUpdateUser(t *testing.T) {
 		t.Log(apiResponse)
 	}
 
-	//verify changings are correct
+	//verify changes are correct
 	resp, apiResponse, err := client.UserApi.GetUserByName(context.Background(), "gopher").Execute()
 	if err != nil {
 		t.Fatalf("Error while getting user by id: %v", err)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/api/openapi.yaml b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/api/openapi.yaml
index 2d7ea625b483..de4b48c1c439 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/api/openapi.yaml
+++ b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/api/openapi.yaml
@@ -364,7 +364,7 @@ paths:
       x-accepts: application/json
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/docs/StoreApi.md b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/docs/StoreApi.md
index 22a4bf0ac3cd..a88a09d61ec2 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/docs/StoreApi.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/docs/StoreApi.md
@@ -150,7 +150,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/api/StoreApi.java
index b3a8544fb0b1..612bf71da3e2 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -174,7 +174,7 @@ public ApiResponse> getInventoryWithHttpInfo() throws ApiEx
   }
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    * @param orderId ID of pet that needs to be fetched (required)
    * @return Order
    * @throws ApiException if fails to make API call
@@ -192,7 +192,7 @@ public Order getOrderById(Long orderId) throws ApiException {
 
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    * @param orderId ID of pet that needs to be fetched (required)
    * @return ApiResponse<Order>
    * @throws ApiException if fails to make API call
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/test/java/org/openapitools/client/api/StoreApiTest.java
index 4f76041a94a6..96b759211e29 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -63,7 +63,7 @@ public void getInventoryTest() throws ApiException {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @throws ApiException if the Api call fails
      */
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/api/openapi.yaml b/samples/openapi3/client/petstore/java/jersey2-java8/api/openapi.yaml
index bd4e3fa22b6c..3e2a497d7a8d 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/api/openapi.yaml
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/api/openapi.yaml
@@ -386,7 +386,7 @@ paths:
       x-accepts: application/json
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -686,7 +686,7 @@ paths:
         style: form
       responses:
         "400":
-          description: Someting wrong
+          description: Something wrong
       security:
       - bearer_test: []
       summary: Fake endpoint to test group parameters (optional)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/FakeApi.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/FakeApi.md
index 00365edeae97..0663bb791e4f 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/FakeApi.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/FakeApi.md
@@ -861,7 +861,7 @@ null (empty response body)
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-| **400** | Someting wrong |  -  |
+| **400** | Something wrong |  -  |
 
 
 ## testInlineAdditionalProperties
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/StoreApi.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/StoreApi.md
index a3cbc7ec0507..6eab555ee029 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/StoreApi.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/StoreApi.md
@@ -150,7 +150,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java
index 129e896a7a3e..5b555dab325c 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -982,7 +982,7 @@ public APItestGroupParametersRequest int64Group(Long int64Group) {
      * @http.response.details
        
-         
+         

          
 Status Code  Description  Response Headers 
 400  Someting wrong   -  
 400  Something wrong   -  

        

      
      */
@@ -998,7 +998,7 @@ public void execute() throws ApiException {
      * @http.response.details
        
-         
+         

          
 Status Code  Description  Response Headers 
 400  Someting wrong   -  
 400  Something wrong   -  

        

 
      */
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/StoreApi.java
index d0b86d18a2a8..ae83b8180437 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -174,7 +174,7 @@ public ApiResponse> getInventoryWithHttpInfo() throws ApiEx
   }
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    * @param orderId ID of pet that needs to be fetched (required)
    * @return Order
    * @throws ApiException if fails to make API call
@@ -192,7 +192,7 @@ public Order getOrderById(Long orderId) throws ApiException {
 
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+   * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
    * @param orderId ID of pet that needs to be fetched (required)
    * @return ApiResponse<Order>
    * @throws ApiException if fails to make API call
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/JSONComposedSchemaTest.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/JSONComposedSchemaTest.java
index 1834c34b0685..7b580659538c 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/JSONComposedSchemaTest.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/JSONComposedSchemaTest.java
@@ -90,7 +90,7 @@ public void testCastException() throws Exception {
             assertTrue(o.getActualInstance() instanceof AppleReq);
             BananaReq inst2 = o.getBananaReq(); // should throw ClassCastException
         });
-        // comment out below as the erorr message can be different due to JDK versions
+        // comment out below as the error message can be different due to JDK versions
         // org.opentest4j.AssertionFailedError: expected:  but was: 
         //Assertions.assertEquals("class org.openapitools.client.model.AppleReq cannot be cast to class org.openapitools.client.model.BananaReq (org.openapitools.client.model.AppleReq and org.openapitools.client.model.BananaReq are in unnamed module of loader 'app')", thrown.getMessage());
        Assertions.assertNotNull(thrown);
@@ -141,7 +141,7 @@ public void testOneOfSchemaWithoutDiscriminator() throws Exception {
             });
             assertTrue(exception.getMessage().contains("Failed deserialization for FruitReq: 2 classes match result"));
             // TODO: add a similar unit test where the oneOf child schemas have required properties.
-            // If the implementation is correct, the unmarshaling should take the "required" keyword
+            // If the implementation is correct, the unmarshalling should take the "required" keyword
             // into consideration, which it is not doing currently.
         }
         {
@@ -232,7 +232,7 @@ public void testOneOfNullable() throws Exception {
     @Test
     public void testOneOfMultipleDiscriminators() throws Exception {
         // 'shapeType' is a discriminator for the 'Shape' model and
-        // 'triangleType' is a discriminator forr the 'Triangle' model.
+        // 'triangleType' is a discriminator for the 'Triangle' model.
         String str = "{ \"shapeType\": \"Triangle\", \"triangleType\": \"EquilateralTriangle\" }";
 
         // We should be able to deserialize a equilateral triangle into a EquilateralTriangle class.
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/api/StoreApiTest.java
index 38f008c16cdb..f609a3701644 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -63,7 +63,7 @@ public void getInventoryTest() throws ApiException {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @throws ApiException if the Api call fails
      */
diff --git a/samples/openapi3/client/petstore/jaxrs-cxf-client-jackson-nullable/src/gen/java/org/openapitools/api/FakeApi.java b/samples/openapi3/client/petstore/jaxrs-cxf-client-jackson-nullable/src/gen/java/org/openapitools/api/FakeApi.java
index de1af3fa9f39..2f105b2b40e2 100644
--- a/samples/openapi3/client/petstore/jaxrs-cxf-client-jackson-nullable/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/openapi3/client/petstore/jaxrs-cxf-client-jackson-nullable/src/gen/java/org/openapitools/api/FakeApi.java
@@ -167,7 +167,7 @@ public interface FakeApi  {
     
     @ApiOperation(value = "Fake endpoint to test group parameters (optional)", tags={  })
     @ApiResponses(value = { 
-        @ApiResponse(code = 400, message = "Someting wrong") })
+        @ApiResponse(code = 400, message = "Something wrong") })
     public void testGroupParameters(@QueryParam("required_string_group") Integer requiredStringGroup, @HeaderParam("required_boolean_group")  Boolean requiredBooleanGroup, @QueryParam("required_int64_group") Long requiredInt64Group, @QueryParam("string_group") Integer stringGroup, @HeaderParam("boolean_group")  Boolean booleanGroup, @QueryParam("int64_group") Long int64Group);
 
     /**
diff --git a/samples/openapi3/client/petstore/jaxrs-cxf-client-jackson-nullable/src/gen/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/jaxrs-cxf-client-jackson-nullable/src/gen/java/org/openapitools/api/StoreApi.java
index e2f31aa5ae15..06afe6cc2626 100644
--- a/samples/openapi3/client/petstore/jaxrs-cxf-client-jackson-nullable/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/openapi3/client/petstore/jaxrs-cxf-client-jackson-nullable/src/gen/java/org/openapitools/api/StoreApi.java
@@ -58,7 +58,7 @@ public interface StoreApi  {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      */
     @GET
diff --git a/samples/openapi3/client/petstore/jaxrs-cxf-client-jackson-nullable/src/test/java/org/openapitools/api/StoreApiTest.java b/samples/openapi3/client/petstore/jaxrs-cxf-client-jackson-nullable/src/test/java/org/openapitools/api/StoreApiTest.java
index 1d11fa63e2f3..b43b7c5b71b3 100644
--- a/samples/openapi3/client/petstore/jaxrs-cxf-client-jackson-nullable/src/test/java/org/openapitools/api/StoreApiTest.java
+++ b/samples/openapi3/client/petstore/jaxrs-cxf-client-jackson-nullable/src/test/java/org/openapitools/api/StoreApiTest.java
@@ -97,7 +97,7 @@ public void getInventoryTest() {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @throws ApiException
      *          if the Api call fails
diff --git a/samples/openapi3/client/petstore/kotlin-deprecated/docs/StoreApi.md b/samples/openapi3/client/petstore/kotlin-deprecated/docs/StoreApi.md
index bfe58c062ca4..d2c01ffc5f44 100644
--- a/samples/openapi3/client/petstore/kotlin-deprecated/docs/StoreApi.md
+++ b/samples/openapi3/client/petstore/kotlin-deprecated/docs/StoreApi.md
@@ -108,7 +108,7 @@ Configure api_key:
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```kotlin
diff --git a/samples/openapi3/client/petstore/kotlin-deprecated/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/openapi3/client/petstore/kotlin-deprecated/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index a444fb267102..ac0e2c7d0032 100644
--- a/samples/openapi3/client/petstore/kotlin-deprecated/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-deprecated/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -115,7 +115,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath)
 
     /**
     * Find purchase order by ID
-    * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
     * @param orderId ID of pet that needs to be fetched 
     * @return Order
     * @throws UnsupportedOperationException If the API returns an informational or redirection response
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/StoreApi.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/StoreApi.md
index 426b7c2695e6..a0bef3ca1926 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/StoreApi.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/StoreApi.md
@@ -89,7 +89,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```kotlin
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
index 0164cd8f1a86..70b21c8ac0ab 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
@@ -177,7 +177,7 @@ interface FakeApi {
      * Fake endpoint to test group parameters (optional)
      * Fake endpoint to test group parameters (optional)
      * Responses:
-     *  - 400: Someting wrong
+     *  - 400: Something wrong
      * 
      * @param requiredStringGroup Required String in group parameters 
      * @param requiredBooleanGroup Required Boolean in group parameters 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index 13b1b964164c..278e34888741 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -34,7 +34,7 @@ interface StoreApi {
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Responses:
      *  - 200: successful operation
      *  - 400: Invalid ID supplied
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/StoreApi.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/StoreApi.md
index af9cc98c26be..6679986a80de 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/StoreApi.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/StoreApi.md
@@ -85,7 +85,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```kotlin
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
index 3b12c1e6fc3c..dc48e24db4cb 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
@@ -177,7 +177,7 @@ interface FakeApi {
      * Fake endpoint to test group parameters (optional)
      * Fake endpoint to test group parameters (optional)
      * Responses:
-     *  - 400: Someting wrong
+     *  - 400: Something wrong
      * 
      * @param requiredStringGroup Required String in group parameters 
      * @param requiredBooleanGroup Required Boolean in group parameters 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index 5b2aabc8fd65..743fcc849428 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -34,7 +34,7 @@ interface StoreApi {
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Responses:
      *  - 200: successful operation
      *  - 400: Invalid ID supplied
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/StoreApi.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/StoreApi.md
index af9cc98c26be..6679986a80de 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/StoreApi.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/StoreApi.md
@@ -85,7 +85,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```kotlin
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
index 4e6072b49b27..d994c8fd6b41 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
@@ -178,7 +178,7 @@ interface FakeApi {
      * Fake endpoint to test group parameters (optional)
      * Fake endpoint to test group parameters (optional)
      * Responses:
-     *  - 400: Someting wrong
+     *  - 400: Something wrong
      * 
      * @param requiredStringGroup Required String in group parameters 
      * @param requiredBooleanGroup Required Boolean in group parameters 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index 6c489f464070..f95035971b76 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -35,7 +35,7 @@ interface StoreApi {
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Responses:
      *  - 200: successful operation
      *  - 400: Invalid ID supplied
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/docs/StoreApi.md b/samples/openapi3/client/petstore/kotlin-multiplatform/docs/StoreApi.md
index 55bd8afdbc09..9ffc2eb32abd 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/docs/StoreApi.md
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/docs/StoreApi.md
@@ -108,7 +108,7 @@ Configure api_key:
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```kotlin
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt
index 01211e213d19..fb9a1e9cabec 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -113,7 +113,7 @@ class StoreApi @UseExperimental(UnstableDefault::class) constructor(
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched 
      * @return Order
      */
diff --git a/samples/openapi3/client/petstore/kotlin/docs/StoreApi.md b/samples/openapi3/client/petstore/kotlin/docs/StoreApi.md
index 55bd8afdbc09..9ffc2eb32abd 100644
--- a/samples/openapi3/client/petstore/kotlin/docs/StoreApi.md
+++ b/samples/openapi3/client/petstore/kotlin/docs/StoreApi.md
@@ -108,7 +108,7 @@ Configure api_key:
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 ```kotlin
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index ba702612083e..5bcbf030dba1 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -115,7 +115,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath)
 
     /**
     * Find purchase order by ID
-    * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
     * @param orderId ID of pet that needs to be fetched 
     * @return Order
     * @throws UnsupportedOperationException If the API returns an informational or redirection response
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/FakeApi.md b/samples/openapi3/client/petstore/python-legacy/docs/FakeApi.md
index 72478b719f4c..1fed1dfce9bb 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/FakeApi.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/FakeApi.md
@@ -1007,7 +1007,7 @@ void (empty response body)
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-**400** | Someting wrong |  -  |
+**400** | Something wrong |  -  |
 
 [[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)
 
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/StoreApi.md b/samples/openapi3/client/petstore/python-legacy/docs/StoreApi.md
index 90846d98d5af..28975756fb5a 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/StoreApi.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/StoreApi.md
@@ -146,7 +146,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/openapi3/client/petstore/python-legacy/petstore_api/api/store_api.py b/samples/openapi3/client/petstore/python-legacy/petstore_api/api/store_api.py
index 02fe7dcbf57b..6e0af56af810 100755
--- a/samples/openapi3/client/petstore/python-legacy/petstore_api/api/store_api.py
+++ b/samples/openapi3/client/petstore/python-legacy/petstore_api/api/store_api.py
@@ -297,7 +297,7 @@ def get_inventory_with_http_info(self, **kwargs):  # noqa: E501
     def get_order_by_id(self, order_id, **kwargs):  # noqa: E501
         """Find purchase order by ID  # noqa: E501
 
-        For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions  # noqa: E501
+        For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
 
@@ -327,7 +327,7 @@ def get_order_by_id(self, order_id, **kwargs):  # noqa: E501
     def get_order_by_id_with_http_info(self, order_id, **kwargs):  # noqa: E501
         """Find purchase order by ID  # noqa: E501
 
-        For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions  # noqa: E501
+        For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
 
diff --git a/samples/openapi3/client/petstore/python-prior/docs/FakeApi.md b/samples/openapi3/client/petstore/python-prior/docs/FakeApi.md
index 07ecc5cf925a..74beeb930cbd 100644
--- a/samples/openapi3/client/petstore/python-prior/docs/FakeApi.md
+++ b/samples/openapi3/client/petstore/python-prior/docs/FakeApi.md
@@ -1575,7 +1575,7 @@ void (empty response body)
 
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
-**400** | Someting wrong |  -  |
+**400** | Something wrong |  -  |
 
 [[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)
 
diff --git a/samples/openapi3/client/petstore/python-prior/docs/FruitReq.md b/samples/openapi3/client/petstore/python-prior/docs/FruitReq.md
index 096dde573091..086a82233533 100644
--- a/samples/openapi3/client/petstore/python-prior/docs/FruitReq.md
+++ b/samples/openapi3/client/petstore/python-prior/docs/FruitReq.md
@@ -1,6 +1,6 @@
 # FruitReq
 
-a schema where additionalProperties is on in the composed schema and off in the oneOf object schemas also, this schem accepts null as a value
+a schema where additionalProperties is on in the composed schema and off in the oneOf object schemas also, this scheme accepts null as a value
 
 ## Properties
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/python-prior/docs/StoreApi.md b/samples/openapi3/client/petstore/python-prior/docs/StoreApi.md
index 13d1c6d2a5e1..1abbf51ab6b9 100644
--- a/samples/openapi3/client/petstore/python-prior/docs/StoreApi.md
+++ b/samples/openapi3/client/petstore/python-prior/docs/StoreApi.md
@@ -154,7 +154,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/openapi3/client/petstore/python-prior/petstore_api/api/store_api.py b/samples/openapi3/client/petstore/python-prior/petstore_api/api/store_api.py
index 1e63e3bef307..27adc2c008de 100644
--- a/samples/openapi3/client/petstore/python-prior/petstore_api/api/store_api.py
+++ b/samples/openapi3/client/petstore/python-prior/petstore_api/api/store_api.py
@@ -402,7 +402,7 @@ def get_order_by_id(
     ):
         """Find purchase order by ID  # noqa: E501
 
-        For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions  # noqa: E501
+        For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
 
diff --git a/samples/openapi3/client/petstore/python-prior/petstore_api/models/__init__.py b/samples/openapi3/client/petstore/python-prior/petstore_api/models/__init__.py
index dd8afc1d8bf5..4be9629a182c 100644
--- a/samples/openapi3/client/petstore/python-prior/petstore_api/models/__init__.py
+++ b/samples/openapi3/client/petstore/python-prior/petstore_api/models/__init__.py
@@ -4,7 +4,7 @@
 # if you have many models here with many references from one model to another this may
 # raise a RecursionError
 # to avoid this, import only the models that you directly need like:
-# from from petstore_api.model.pet import Pet
+# from petstore_api.model.pet import Pet
 # or import this package, but before doing it, use:
 # import sys
 # sys.setrecursionlimit(n)
diff --git a/samples/openapi3/client/petstore/python-prior/tests_manual/test_deserialization.py b/samples/openapi3/client/petstore/python-prior/tests_manual/test_deserialization.py
index 93538160f9a8..1d8ab1b424fd 100644
--- a/samples/openapi3/client/petstore/python-prior/tests_manual/test_deserialization.py
+++ b/samples/openapi3/client/petstore/python-prior/tests_manual/test_deserialization.py
@@ -88,7 +88,7 @@ def test_deserialize_animal(self):
         """
         deserialize Animal to a Dog instance
         Animal uses a discriminator which has a map built of child classes
-        that inherrit from Animal
+        that inherit from Animal
         This is the swagger (v2) way of doing something like oneOf composition
         """
         class_name = 'Dog'
diff --git a/samples/openapi3/client/petstore/python-prior/tests_manual/test_http_signature.py b/samples/openapi3/client/petstore/python-prior/tests_manual/test_http_signature.py
index c6854d666c74..f299162c2476 100644
--- a/samples/openapi3/client/petstore/python-prior/tests_manual/test_http_signature.py
+++ b/samples/openapi3/client/petstore/python-prior/tests_manual/test_http_signature.py
@@ -279,7 +279,7 @@ def test_valid_http_signature(self):
             ]
         )
         config = Configuration(host=HOST, signing_info=signing_cfg)
-        # Set the OAuth2 acces_token to None. Here we are interested in testing
+        # Set the OAuth2 access_token to None. Here we are interested in testing
         # the HTTP signature scheme.
         config.access_token = None
 
@@ -310,7 +310,7 @@ def test_valid_http_signature_with_defaults(self):
             private_key_passphrase=self.private_key_passphrase,
         )
         config = Configuration(host=HOST, signing_info=signing_cfg)
-        # Set the OAuth2 acces_token to None. Here we are interested in testing
+        # Set the OAuth2 access_token to None. Here we are interested in testing
         # the HTTP signature scheme.
         config.access_token = None
 
@@ -346,7 +346,7 @@ def test_valid_http_signature_rsassa_pkcs1v15(self):
             ]
         )
         config = Configuration(host=HOST, signing_info=signing_cfg)
-        # Set the OAuth2 acces_token to None. Here we are interested in testing
+        # Set the OAuth2 access_token to None. Here we are interested in testing
         # the HTTP signature scheme.
         config.access_token = None
 
@@ -382,7 +382,7 @@ def test_valid_http_signature_rsassa_pss(self):
             ]
         )
         config = Configuration(host=HOST, signing_info=signing_cfg)
-        # Set the OAuth2 acces_token to None. Here we are interested in testing
+        # Set the OAuth2 access_token to None. Here we are interested in testing
         # the HTTP signature scheme.
         config.access_token = None
 
@@ -418,7 +418,7 @@ def test_valid_http_signature_ec_p521(self):
             ]
         )
         config = Configuration(host=HOST, signing_info=signing_cfg)
-        # Set the OAuth2 acces_token to None. Here we are interested in testing
+        # Set the OAuth2 access_token to None. Here we are interested in testing
         # the HTTP signature scheme.
         config.access_token = None
 
diff --git a/samples/openapi3/client/petstore/python/README.md b/samples/openapi3/client/petstore/python/README.md
index ca7562b37e7c..3cff535d8ef6 100644
--- a/samples/openapi3/client/petstore/python/README.md
+++ b/samples/openapi3/client/petstore/python/README.md
@@ -198,7 +198,7 @@ Class | Method | HTTP request | Description
 *FakeApi* | [**object_model_with_ref_props**](docs/apis/tags/FakeApi.md#object_model_with_ref_props) | **post** /fake/refs/object_model_with_ref_props | 
 *FakeApi* | [**parameter_collisions**](docs/apis/tags/FakeApi.md#parameter_collisions) | **post** /fake/parameterCollisions/{1}/{aB}/{Ab}/{self}/{A-B}/ | parameter collision case
 *FakeApi* | [**query_param_with_json_content_type**](docs/apis/tags/FakeApi.md#query_param_with_json_content_type) | **get** /fake/queryParamWithJsonContentType | query param with json content-type
-*FakeApi* | [**query_parameter_collection_format**](docs/apis/tags/FakeApi.md#query_parameter_collection_format) | **put** /fake/test-query-paramters | 
+*FakeApi* | [**query_parameter_collection_format**](docs/apis/tags/FakeApi.md#query_parameter_collection_format) | **put** /fake/test-query-parameters | 
 *FakeApi* | [**ref_object_in_query**](docs/apis/tags/FakeApi.md#ref_object_in_query) | **get** /fake/refObjInQuery | user list
 *FakeApi* | [**response_without_schema**](docs/apis/tags/FakeApi.md#response_without_schema) | **get** /fake/responseWithoutSchema | receives a response without schema
 *FakeApi* | [**string**](docs/apis/tags/FakeApi.md#string) | **post** /fake/refs/string | 
diff --git a/samples/openapi3/client/petstore/python/docs/apis/tags/FakeApi.md b/samples/openapi3/client/petstore/python/docs/apis/tags/FakeApi.md
index e8690102866c..a3d797cec250 100644
--- a/samples/openapi3/client/petstore/python/docs/apis/tags/FakeApi.md
+++ b/samples/openapi3/client/petstore/python/docs/apis/tags/FakeApi.md
@@ -30,7 +30,7 @@ Method | HTTP request | Description
 [**object_model_with_ref_props**](#object_model_with_ref_props) | **post** /fake/refs/object_model_with_ref_props | 
 [**parameter_collisions**](#parameter_collisions) | **post** /fake/parameterCollisions/{1}/{aB}/{Ab}/{self}/{A-B}/ | parameter collision case
 [**query_param_with_json_content_type**](#query_param_with_json_content_type) | **get** /fake/queryParamWithJsonContentType | query param with json content-type
-[**query_parameter_collection_format**](#query_parameter_collection_format) | **put** /fake/test-query-paramters | 
+[**query_parameter_collection_format**](#query_parameter_collection_format) | **put** /fake/test-query-parameters | 
 [**ref_object_in_query**](#ref_object_in_query) | **get** /fake/refObjInQuery | user list
 [**response_without_schema**](#response_without_schema) | **get** /fake/responseWithoutSchema | receives a response without schema
 [**string**](#string) | **post** /fake/refs/string | 
@@ -561,7 +561,7 @@ No authorization required
 
 
 
-Ensures that original naming is used in endpoint params, that way we on't have collisions
+Ensures that original naming is used in endpoint params, that way we won't have collisions
 
 ### Example
 
diff --git a/samples/openapi3/client/petstore/python/docs/apis/tags/StoreApi.md b/samples/openapi3/client/petstore/python/docs/apis/tags/StoreApi.md
index a75abbcffc0d..94a5cdb8c6c5 100644
--- a/samples/openapi3/client/petstore/python/docs/apis/tags/StoreApi.md
+++ b/samples/openapi3/client/petstore/python/docs/apis/tags/StoreApi.md
@@ -183,7 +183,7 @@ Key | Input Type | Accessed Type | Description | Notes
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/openapi3/client/petstore/python/git_push.sh b/samples/openapi3/client/petstore/python/git_push.sh
index ced3be2b0c7b..200e975d2120 100644
--- a/samples/openapi3/client/petstore/python/git_push.sh
+++ b/samples/openapi3/client/petstore/python/git_push.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update" "gitlab.com"
 
 git_user_id=$1
 git_repo_id=$2
diff --git a/samples/openapi3/client/petstore/python/petstore_api/api_client.py b/samples/openapi3/client/petstore/python/petstore_api/api_client.py
index 163013facda6..db9cfc03613b 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/api_client.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/api_client.py
@@ -1250,9 +1250,9 @@ def update_params_for_auth(self, headers, auth_settings,
                     # The HTTP signature scheme requires multiple HTTP headers
                     # that are calculated dynamically.
                     signing_info = self.configuration.signing_info
-                    querys = tuple()
+                    queries = tuple()
                     auth_headers = signing_info.get_http_signature_headers(
-                                        resource_path, method, headers, body, querys)
+                                        resource_path, method, headers, body, queries)
                     for key, value in auth_headers.items():
                         headers.add(key, value)
             elif auth_setting['in'] == 'query':
diff --git a/samples/openapi3/client/petstore/python/petstore_api/apis/path_to_api.py b/samples/openapi3/client/petstore/python/petstore_api/apis/path_to_api.py
index db788e610596..125ec78c8942 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/apis/path_to_api.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/apis/path_to_api.py
@@ -34,7 +34,7 @@
 from petstore_api.apis.paths.another_fake_dummy import AnotherFakeDummy
 from petstore_api.apis.paths.fake_body_with_file_schema import FakeBodyWithFileSchema
 from petstore_api.apis.paths.fake_case_sensitive_params import FakeCaseSensitiveParams
-from petstore_api.apis.paths.fake_test_query_paramters import FakeTestQueryParamters
+from petstore_api.apis.paths.fake_test_query_parameters import FakeTestQueryParameters
 from petstore_api.apis.paths.fake_pet_id_upload_image_with_required_file import FakePetIdUploadImageWithRequiredFile
 from petstore_api.apis.paths.fake_parameter_collisions_1_a_b_ab_self_a_b_ import FakeParameterCollisions1ABAbSelfAB
 from petstore_api.apis.paths.fake_upload_file import FakeUploadFile
@@ -86,7 +86,7 @@
         PathValues.ANOTHERFAKE_DUMMY: AnotherFakeDummy,
         PathValues.FAKE_BODYWITHFILESCHEMA: FakeBodyWithFileSchema,
         PathValues.FAKE_CASESENSITIVEPARAMS: FakeCaseSensitiveParams,
-        PathValues.FAKE_TESTQUERYPARAMTERS: FakeTestQueryParamters,
+        PathValues.FAKE_TESTQUERYPARAMETERS: FakeTestQueryParameters,
         PathValues.FAKE_PET_ID_UPLOAD_IMAGE_WITH_REQUIRED_FILE: FakePetIdUploadImageWithRequiredFile,
         PathValues.FAKE_PARAMETER_COLLISIONS_1_A_B_AB_SELF_AB_: FakeParameterCollisions1ABAbSelfAB,
         PathValues.FAKE_UPLOAD_FILE: FakeUploadFile,
@@ -139,7 +139,7 @@
         PathValues.ANOTHERFAKE_DUMMY: AnotherFakeDummy,
         PathValues.FAKE_BODYWITHFILESCHEMA: FakeBodyWithFileSchema,
         PathValues.FAKE_CASESENSITIVEPARAMS: FakeCaseSensitiveParams,
-        PathValues.FAKE_TESTQUERYPARAMTERS: FakeTestQueryParamters,
+        PathValues.FAKE_TESTQUERYPARAMETERS: FakeTestQueryParameters,
         PathValues.FAKE_PET_ID_UPLOAD_IMAGE_WITH_REQUIRED_FILE: FakePetIdUploadImageWithRequiredFile,
         PathValues.FAKE_PARAMETER_COLLISIONS_1_A_B_AB_SELF_AB_: FakeParameterCollisions1ABAbSelfAB,
         PathValues.FAKE_UPLOAD_FILE: FakeUploadFile,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/apis/paths/fake_test_query_parameters.py b/samples/openapi3/client/petstore/python/petstore_api/apis/paths/fake_test_query_parameters.py
new file mode 100644
index 000000000000..bbfebcdcedbe
--- /dev/null
+++ b/samples/openapi3/client/petstore/python/petstore_api/apis/paths/fake_test_query_parameters.py
@@ -0,0 +1,7 @@
+from petstore_api.paths.fake_test_query_parameters.put import ApiForput
+
+
+class FakeTestQueryParameters(
+    ApiForput,
+):
+    pass
diff --git a/samples/openapi3/client/petstore/python/petstore_api/apis/paths/fake_test_query_paramters.py b/samples/openapi3/client/petstore/python/petstore_api/apis/paths/fake_test_query_paramters.py
deleted file mode 100644
index ff97fcdf59b7..000000000000
--- a/samples/openapi3/client/petstore/python/petstore_api/apis/paths/fake_test_query_paramters.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from petstore_api.paths.fake_test_query_paramters.put import ApiForput
-
-
-class FakeTestQueryParamters(
-    ApiForput,
-):
-    pass
diff --git a/samples/openapi3/client/petstore/python/petstore_api/apis/tags/fake_api.py b/samples/openapi3/client/petstore/python/petstore_api/apis/tags/fake_api.py
index 564d77038a37..f232a5cc5e02 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/apis/tags/fake_api.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/apis/tags/fake_api.py
@@ -34,7 +34,7 @@
 from petstore_api.paths.fake_refs_object_model_with_ref_props.post import ObjectModelWithRefProps
 from petstore_api.paths.fake_parameter_collisions_1_a_b_ab_self_a_b_.post import ParameterCollisions
 from petstore_api.paths.fake_query_param_with_json_content_type.get import QueryParamWithJsonContentType
-from petstore_api.paths.fake_test_query_paramters.put import QueryParameterCollectionFormat
+from petstore_api.paths.fake_test_query_parameters.put import QueryParameterCollectionFormat
 from petstore_api.paths.fake_ref_obj_in_query.get import RefObjectInQuery
 from petstore_api.paths.fake_response_without_schema.get import ResponseWithoutSchema
 from petstore_api.paths.fake_refs_string.post import String
diff --git a/samples/openapi3/client/petstore/python/petstore_api/configuration.py b/samples/openapi3/client/petstore/python/petstore_api/configuration.py
index f7c2a3ff91eb..2fe7662d5008 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/configuration.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/configuration.py
@@ -131,7 +131,7 @@ class Configuration(object):
     'Authorization' header, which is used to carry the signature.
 
     One may be tempted to sign all headers by default, but in practice it rarely works.
-    This is beccause explicit proxies, transparent proxies, TLS termination endpoints or
+    This is because explicit proxies, transparent proxies, TLS termination endpoints or
     load balancers may add/modify/remove headers. Include the HTTP headers that you know
     are not going to be modified in transit.
 
@@ -301,7 +301,7 @@ def __setattr__(self, name, value):
                         "Invalid keyword: '{0}''".format(v))
             self._disabled_client_side_validations = s
         if name == "signing_info" and value is not None:
-            # Ensure the host paramater from signing info is the same as
+            # Ensure the host parameter from signing info is the same as
             # Configuration.host.
             value.host = self.host
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/models/__init__.py
index 92305b81c139..2d7b91d22868 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/__init__.py
@@ -6,7 +6,7 @@
 # if you have many models here with many references from one model to another this may
 # raise a RecursionError
 # to avoid this, import only the models that you directly need like:
-# from from petstore_api.model.pet import Pet
+# from petstore_api.model.pet import Pet
 # or import this package, but before doing it, use:
 # import sys
 # sys.setrecursionlimit(n)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/__init__.py
index 9b8c0ff4bbf7..79f28fc11eb4 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/__init__.py
@@ -39,7 +39,7 @@ class PathValues(str, enum.Enum):
     ANOTHERFAKE_DUMMY = "/another-fake/dummy"
     FAKE_BODYWITHFILESCHEMA = "/fake/body-with-file-schema"
     FAKE_CASESENSITIVEPARAMS = "/fake/case-sensitive-params"
-    FAKE_TESTQUERYPARAMTERS = "/fake/test-query-paramters"
+    FAKE_TESTQUERYPARAMETERS = "/fake/test-query-parameters"
     FAKE_PET_ID_UPLOAD_IMAGE_WITH_REQUIRED_FILE = "/fake/{petId}/uploadImageWithRequiredFile"
     FAKE_PARAMETER_COLLISIONS_1_A_B_AB_SELF_AB_ = "/fake/parameterCollisions/{1}/{aB}/{Ab}/{self}/{A-B}/"
     FAKE_UPLOAD_FILE = "/fake/uploadFile"
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_parameters/__init__.py
similarity index 68%
rename from samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/__init__.py
rename to samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_parameters/__init__.py
index ada979815377..82abd0ac65e6 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_parameters/__init__.py
@@ -1,7 +1,7 @@
 # do not import all endpoints into this module because that uses a lot of memory and stack frames
 # if you need the ability to import all endpoints from this module, import them with
-# from petstore_api.paths.fake_test_query_paramters import Api
+# from petstore_api.paths.fake_test_query_parameters import Api
 
 from petstore_api.paths import PathValues
 
-path = PathValues.FAKE_TESTQUERYPARAMTERS
\ No newline at end of file
+path = PathValues.FAKE_TESTQUERYPARAMETERS
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_parameters/put.py
similarity index 100%
rename from samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put.py
rename to samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_parameters/put.py
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_parameters/put.pyi
similarity index 100%
rename from samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put.pyi
rename to samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_parameters/put.pyi
diff --git a/samples/openapi3/client/petstore/python/petstore_api/schemas.py b/samples/openapi3/client/petstore/python/petstore_api/schemas.py
index 18d0e8c4a5f7..9186b8beef99 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/schemas.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/schemas.py
@@ -385,7 +385,7 @@ def __get_new_cls(
             _validate_oapg returns a key value pair
             where the key is the path to the item, and the value will be the required manufactured class
             made out of the matching schemas
-        2. value is an instance of the the correct schema type
+        2. value is an instance of the correct schema type
             the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
             for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
             and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
@@ -868,7 +868,7 @@ def _is_json_validation_enabled_oapg(schema_keyword, configuration=None):
             schema_keyword not in configuration._disabled_client_side_validations)
 
     @staticmethod
-    def _raise_validation_errror_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=""):
+    def _raise_validation_error_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=""):
         raise ApiValueError(
             "Invalid value `{value}`, {constraint_msg} `{constraint_value}`{additional_txt} at {path_to_item}".format(
                 value=value,
@@ -963,7 +963,7 @@ def __check_str_validations(
         if (cls._is_json_validation_enabled_oapg('maxLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_length') and
                 len(arg) > cls.MetaOapg.max_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="length must be less than or equal to",
                 constraint_value=cls.MetaOapg.max_length,
@@ -973,7 +973,7 @@ def __check_str_validations(
         if (cls._is_json_validation_enabled_oapg('minLength', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_length') and
                 len(arg) < cls.MetaOapg.min_length):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="length must be greater than or equal to",
                 constraint_value=cls.MetaOapg.min_length,
@@ -988,14 +988,14 @@ def __check_str_validations(
                     if flags != 0:
                         # Don't print the regex flags if the flags are not
                         # specified in the OAS document.
-                        cls._raise_validation_errror_message_oapg(
+                        cls._raise_validation_error_message_oapg(
                             value=arg,
                             constraint_msg="must match regular expression",
                             constraint_value=regex_dict['pattern'],
                             path_to_item=validation_metadata.path_to_item,
                             additional_txt=" with flags=`{}`".format(flags)
                         )
-                    cls._raise_validation_errror_message_oapg(
+                    cls._raise_validation_error_message_oapg(
                         value=arg,
                         constraint_msg="must match regular expression",
                         constraint_value=regex_dict['pattern'],
@@ -1211,7 +1211,7 @@ def as_float_oapg(self) -> float:
             return self._as_float
         except AttributeError:
             if self.as_tuple().exponent >= 0:
-                raise ApiValueError(f'{self} is not an float')
+                raise ApiValueError(f'{self} is not a float')
             self._as_float = float(self)
             return self._as_float
 
@@ -1228,7 +1228,7 @@ def __check_numeric_validations(
             multiple_of_value = cls.MetaOapg.multiple_of
             if (not (float(arg) / multiple_of_value).is_integer()):
                 # Note 'multipleOf' will be as good as the floating point arithmetic.
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg="value must be a multiple of",
                     constraint_value=multiple_of_value,
@@ -1249,7 +1249,7 @@ def __check_numeric_validations(
         if (cls._is_json_validation_enabled_oapg('exclusiveMaximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_maximum') and
                 arg >= cls.MetaOapg.exclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="must be a value less than",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -1259,7 +1259,7 @@ def __check_numeric_validations(
         if (cls._is_json_validation_enabled_oapg('maximum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_maximum') and
                 arg > cls.MetaOapg.inclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="must be a value less than or equal to",
                 constraint_value=cls.MetaOapg.inclusive_maximum,
@@ -1269,7 +1269,7 @@ def __check_numeric_validations(
         if (cls._is_json_validation_enabled_oapg('exclusiveMinimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'exclusive_minimum') and
                 arg <= cls.MetaOapg.exclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="must be a value greater than",
                 constraint_value=cls.MetaOapg.exclusive_maximum,
@@ -1279,7 +1279,7 @@ def __check_numeric_validations(
         if (cls._is_json_validation_enabled_oapg('minimum', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'inclusive_minimum') and
                 arg < cls.MetaOapg.inclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="must be a value greater than or equal to",
                 constraint_value=cls.MetaOapg.inclusive_minimum,
@@ -1347,7 +1347,7 @@ def __check_tuple_validations(
         if (cls._is_json_validation_enabled_oapg('maxItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_items') and
                 len(arg) > cls.MetaOapg.max_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="number of items must be less than or equal to",
                 constraint_value=cls.MetaOapg.max_items,
@@ -1357,7 +1357,7 @@ def __check_tuple_validations(
         if (cls._is_json_validation_enabled_oapg('minItems', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_items') and
                 len(arg) < cls.MetaOapg.min_items):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="number of items must be greater than or equal to",
                 constraint_value=cls.MetaOapg.min_items,
@@ -1368,7 +1368,7 @@ def __check_tuple_validations(
                 hasattr(cls.MetaOapg, 'unique_items') and cls.MetaOapg.unique_items and arg):
             unique_items = set(arg)
             if len(arg) > len(unique_items):
-                cls._raise_validation_errror_message_oapg(
+                cls._raise_validation_error_message_oapg(
                     value=arg,
                     constraint_msg="duplicate items were found, and the tuple must not contain duplicates because",
                     constraint_value='unique_items==True',
@@ -1611,7 +1611,7 @@ def __check_dict_validations(
         if (cls._is_json_validation_enabled_oapg('maxProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'max_properties') and
                 len(arg) > cls.MetaOapg.max_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="number of properties must be less than or equal to",
                 constraint_value=cls.MetaOapg.max_properties,
@@ -1621,7 +1621,7 @@ def __check_dict_validations(
         if (cls._is_json_validation_enabled_oapg('minProperties', validation_metadata.configuration) and
                 hasattr(cls.MetaOapg, 'min_properties') and
                 len(arg) < cls.MetaOapg.min_properties):
-            cls._raise_validation_errror_message_oapg(
+            cls._raise_validation_error_message_oapg(
                 value=arg,
                 constraint_msg="number of properties must be greater than or equal to",
                 constraint_value=cls.MetaOapg.min_properties,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/signing.py b/samples/openapi3/client/petstore/python/petstore_api/signing.py
index 22b3bf2bf1d4..9a6e9e460ec7 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/signing.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/signing.py
@@ -341,7 +341,7 @@ def _get_message_digest(self, data):
         :return: A tuple of (digest, prefix).
             The digest is a hashing object that contains the cryptographic digest of
             the HTTP request.
-            The prefix is a string that identifies the cryptographc hash. It is used
+            The prefix is a string that identifies the cryptographic hash. It is used
             to generate the 'Digest' header as specified in RFC 3230.
         """
         if self.hash_algorithm == HASH_SHA512:
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_test_query_paramters/__init__.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_test_query_parameters/__init__.py
similarity index 100%
rename from samples/openapi3/client/petstore/python/test/test_paths/test_fake_test_query_paramters/__init__.py
rename to samples/openapi3/client/petstore/python/test/test_paths/test_fake_test_query_parameters/__init__.py
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_test_query_paramters/test_put.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_test_query_parameters/test_put.py
similarity index 77%
rename from samples/openapi3/client/petstore/python/test/test_paths/test_fake_test_query_paramters/test_put.py
rename to samples/openapi3/client/petstore/python/test/test_paths/test_fake_test_query_parameters/test_put.py
index e358588324ba..b7bae3ad83a7 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_test_query_paramters/test_put.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_test_query_parameters/test_put.py
@@ -12,15 +12,15 @@
 import urllib3
 
 import petstore_api
-from petstore_api.paths.fake_test_query_paramters import put  # noqa: E501
+from petstore_api.paths.fake_test_query_parameters import put  # noqa: E501
 from petstore_api import configuration, schemas, api_client
 
 from .. import ApiTestMixin
 
 
-class TestFakeTestQueryParamters(ApiTestMixin, unittest.TestCase):
+class TestFakeTestQueryParameters(ApiTestMixin, unittest.TestCase):
     """
-    FakeTestQueryParamters unit test stubs
+    FakeTestQueryParameters unit test stubs
     """
     _configuration = configuration.Configuration()
 
diff --git a/samples/openapi3/client/petstore/python/tests_manual/test_deserialization.py b/samples/openapi3/client/petstore/python/tests_manual/test_deserialization.py
index 7c0300fbcd1d..525cd78219be 100644
--- a/samples/openapi3/client/petstore/python/tests_manual/test_deserialization.py
+++ b/samples/openapi3/client/petstore/python/tests_manual/test_deserialization.py
@@ -83,7 +83,7 @@ def test_deserialize_animal(self):
         """
         deserialize Animal to a Dog instance
         Animal uses a discriminator which has a map built of child classes
-        that inherrit from Animal
+        that inherit from Animal
         This is the swagger (v2) way of doing something like oneOf composition
         """
         from petstore_api.model import animal, dog
diff --git a/samples/openapi3/client/petstore/python/tests_manual/test_http_signature.py b/samples/openapi3/client/petstore/python/tests_manual/test_http_signature.py
index 1db56c65dd2d..d1e09d1ba11a 100644
--- a/samples/openapi3/client/petstore/python/tests_manual/test_http_signature.py
+++ b/samples/openapi3/client/petstore/python/tests_manual/test_http_signature.py
@@ -279,7 +279,7 @@
 #             ]
 #         )
 #         config = Configuration(host=HOST, signing_info=signing_cfg)
-#         # Set the OAuth2 acces_token to None. Here we are interested in testing
+#         # Set the OAuth2 access_token to None. Here we are interested in testing
 #         # the HTTP signature scheme.
 #         config.access_token = None
 #
@@ -310,7 +310,7 @@
 #             private_key_passphrase=self.private_key_passphrase,
 #         )
 #         config = Configuration(host=HOST, signing_info=signing_cfg)
-#         # Set the OAuth2 acces_token to None. Here we are interested in testing
+#         # Set the OAuth2 access_token to None. Here we are interested in testing
 #         # the HTTP signature scheme.
 #         config.access_token = None
 #
@@ -346,7 +346,7 @@
 #             ]
 #         )
 #         config = Configuration(host=HOST, signing_info=signing_cfg)
-#         # Set the OAuth2 acces_token to None. Here we are interested in testing
+#         # Set the OAuth2 access_token to None. Here we are interested in testing
 #         # the HTTP signature scheme.
 #         config.access_token = None
 #
@@ -382,7 +382,7 @@
 #             ]
 #         )
 #         config = Configuration(host=HOST, signing_info=signing_cfg)
-#         # Set the OAuth2 acces_token to None. Here we are interested in testing
+#         # Set the OAuth2 access_token to None. Here we are interested in testing
 #         # the HTTP signature scheme.
 #         config.access_token = None
 #
@@ -418,7 +418,7 @@
 #             ]
 #         )
 #         config = Configuration(host=HOST, signing_info=signing_cfg)
-#         # Set the OAuth2 acces_token to None. Here we are interested in testing
+#         # Set the OAuth2 access_token to None. Here we are interested in testing
 #         # the HTTP signature scheme.
 #         config.access_token = None
 #
diff --git a/samples/openapi3/client/petstore/python/tests_manual/test_object_with_all_of_with_req_test_prop_from_unset_add_prop.py b/samples/openapi3/client/petstore/python/tests_manual/test_object_with_all_of_with_req_test_prop_from_unset_add_prop.py
index 5146c241eb65..7f530f25f0b5 100644
--- a/samples/openapi3/client/petstore/python/tests_manual/test_object_with_all_of_with_req_test_prop_from_unset_add_prop.py
+++ b/samples/openapi3/client/petstore/python/tests_manual/test_object_with_all_of_with_req_test_prop_from_unset_add_prop.py
@@ -23,7 +23,7 @@ def test_model_instantiation(self):
         )
         assert inst == {'test': 'a'}
 
-        # without the required test property an execption is thrown
+        # without the required test property an exception is thrown
         with self.assertRaises(petstore_api.exceptions.ApiTypeError):
             ObjectWithAllOfWithReqTestPropFromUnsetAddProp(
                 name='a'
diff --git a/samples/openapi3/client/petstore/python/tests_manual/test_request_body.py b/samples/openapi3/client/petstore/python/tests_manual/test_request_body.py
index 3e8d687e619f..6cfe190cfd3c 100644
--- a/samples/openapi3/client/petstore/python/tests_manual/test_request_body.py
+++ b/samples/openapi3/client/petstore/python/tests_manual/test_request_body.py
@@ -122,7 +122,7 @@ def test_content_multipart_form_data_serialization(self):
             )
         )
 
-    def test_throws_error_for_nonexistant_content_type(self):
+    def test_throws_error_for_nonexistent_content_type(self):
         request_body = api_client.RequestBody(
             content={'application/json': api_client.MediaType(schema=schemas.AnyTypeSchema)}
         )
diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java
index 5e41c5337328..34a445b90891 100644
--- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java
@@ -92,7 +92,7 @@ ResponseEntity> getInventory(
 
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java
index ce3ad7a5eb62..6aa67c36ac7f 100644
--- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java
@@ -93,7 +93,7 @@ CompletableFuture>> getInventory(
 
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
diff --git a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java
index ee84e42d4c22..4943e148b05b 100644
--- a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java
@@ -68,7 +68,7 @@ ResponseEntity get(
      * update with form data
      *
      * @param date A date path parameter (required)
-     * @param visitDate Updated last vist timestamp (optional, default to 1971-12-19T03:39:57-08:00)
+     * @param visitDate Updated last visit timestamp (optional, default to 1971-12-19T03:39:57-08:00)
      * @return Invalid input (status code 405)
      */
     @Operation(
@@ -84,7 +84,7 @@ ResponseEntity get(
     )
     ResponseEntity updatePetWithForm(
         @Parameter(name = "date", description = "A date path parameter", required = true) @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
-        @Parameter(name = "visitDate", description = "Updated last vist timestamp") @Valid @RequestParam(value = "visitDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime visitDate
+        @Parameter(name = "visitDate", description = "Updated last visit timestamp") @Valid @RequestParam(value = "visitDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime visitDate
     );
 
 }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java
index 3cee3811ffb6..24844f582b0d 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java
@@ -356,14 +356,14 @@ ResponseEntity testEnumParameters(
      * @param stringGroup String in group parameters (optional)
      * @param booleanGroup Boolean in group parameters (optional)
      * @param int64Group Integer in group parameters (optional)
-     * @return Someting wrong (status code 400)
+     * @return Something wrong (status code 400)
      */
     @Operation(
         operationId = "testGroupParameters",
         summary = "Fake endpoint to test group parameters (optional)",
         tags = { "fake" },
         responses = {
-            @ApiResponse(responseCode = "400", description = "Someting wrong")
+            @ApiResponse(responseCode = "400", description = "Something wrong")
         }
     )
     @RequestMapping(
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java
index 4aa4a703929d..e473e225021a 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java
@@ -92,7 +92,7 @@ ResponseEntity> getInventory(
 
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java
index 816e870e6b9d..7362603c2b2b 100644
--- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java
@@ -92,7 +92,7 @@ ResponseEntity> getInventory(
 
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java
index c7ad76d69914..d79552405be2 100644
--- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java
@@ -92,7 +92,7 @@ ResponseEntity> getInventory(
 
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java
index b58dbd9bafce..1aa5ffe1b9a9 100644
--- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java
@@ -92,7 +92,7 @@ ResponseEntity> getInventory(
 
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java
index 765941e6ab2a..9144b524afc5 100644
--- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java
@@ -102,7 +102,7 @@ default ResponseEntity> getInventory(
 
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/StoreApi.md b/samples/openapi3/client/petstore/typescript/builds/browser/StoreApi.md
index 9dfad28caff6..b7d89db061fc 100644
--- a/samples/openapi3/client/petstore/typescript/builds/browser/StoreApi.md
+++ b/samples/openapi3/client/petstore/typescript/builds/browser/StoreApi.md
@@ -116,7 +116,7 @@ This endpoint does not need any parameter.
 # **getOrderById**
 > Order getOrderById()
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/apis/StoreApi.ts b/samples/openapi3/client/petstore/typescript/builds/browser/apis/StoreApi.ts
index c60c1d870815..31cf3aa1f55e 100644
--- a/samples/openapi3/client/petstore/typescript/builds/browser/apis/StoreApi.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/browser/apis/StoreApi.ts
@@ -78,7 +78,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      * @param orderId ID of pet that needs to be fetched
      */
diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/browser/types/ObjectParamAPI.ts
index acc26d9ef93a..41dfaebdde1d 100644
--- a/samples/openapi3/client/petstore/typescript/builds/browser/types/ObjectParamAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/browser/types/ObjectParamAPI.ts
@@ -253,7 +253,7 @@ export class ObjectStoreApi {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      * @param param the request object
      */
diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/browser/types/ObservableAPI.ts
index b5b9a542b245..5e9397ea69f6 100644
--- a/samples/openapi3/client/petstore/typescript/builds/browser/types/ObservableAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/browser/types/ObservableAPI.ts
@@ -288,7 +288,7 @@ export class ObservableStoreApi {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      * @param orderId ID of pet that needs to be fetched
      */
diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/types/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/browser/types/PromiseAPI.ts
index 7279c47febdd..c86ac4a84f38 100644
--- a/samples/openapi3/client/petstore/typescript/builds/browser/types/PromiseAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/browser/types/PromiseAPI.ts
@@ -145,7 +145,7 @@ export class PromiseStoreApi {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      * @param orderId ID of pet that needs to be fetched
      */
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/StoreApi.md b/samples/openapi3/client/petstore/typescript/builds/default/StoreApi.md
index 9dfad28caff6..b7d89db061fc 100644
--- a/samples/openapi3/client/petstore/typescript/builds/default/StoreApi.md
+++ b/samples/openapi3/client/petstore/typescript/builds/default/StoreApi.md
@@ -116,7 +116,7 @@ This endpoint does not need any parameter.
 # **getOrderById**
 > Order getOrderById()
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/apis/StoreApi.ts b/samples/openapi3/client/petstore/typescript/builds/default/apis/StoreApi.ts
index 2682c0fc70a8..3bb0a2de754e 100644
--- a/samples/openapi3/client/petstore/typescript/builds/default/apis/StoreApi.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/default/apis/StoreApi.ts
@@ -80,7 +80,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      * @param orderId ID of pet that needs to be fetched
      */
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/default/types/ObjectParamAPI.ts
index acc26d9ef93a..41dfaebdde1d 100644
--- a/samples/openapi3/client/petstore/typescript/builds/default/types/ObjectParamAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/default/types/ObjectParamAPI.ts
@@ -253,7 +253,7 @@ export class ObjectStoreApi {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      * @param param the request object
      */
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/default/types/ObservableAPI.ts
index b5b9a542b245..5e9397ea69f6 100644
--- a/samples/openapi3/client/petstore/typescript/builds/default/types/ObservableAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/default/types/ObservableAPI.ts
@@ -288,7 +288,7 @@ export class ObservableStoreApi {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      * @param orderId ID of pet that needs to be fetched
      */
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/types/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/default/types/PromiseAPI.ts
index 7279c47febdd..c86ac4a84f38 100644
--- a/samples/openapi3/client/petstore/typescript/builds/default/types/PromiseAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/default/types/PromiseAPI.ts
@@ -145,7 +145,7 @@ export class PromiseStoreApi {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      * @param orderId ID of pet that needs to be fetched
      */
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/StoreApi.md b/samples/openapi3/client/petstore/typescript/builds/deno/StoreApi.md
index 9dfad28caff6..b7d89db061fc 100644
--- a/samples/openapi3/client/petstore/typescript/builds/deno/StoreApi.md
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/StoreApi.md
@@ -116,7 +116,7 @@ This endpoint does not need any parameter.
 # **getOrderById**
 > Order getOrderById()
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/apis/StoreApi.ts b/samples/openapi3/client/petstore/typescript/builds/deno/apis/StoreApi.ts
index b391bc0bad60..99e2f62d65e3 100644
--- a/samples/openapi3/client/petstore/typescript/builds/deno/apis/StoreApi.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/apis/StoreApi.ts
@@ -78,7 +78,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      * @param orderId ID of pet that needs to be fetched
      */
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/deno/types/ObjectParamAPI.ts
index 271b489d45be..e499b3bc620c 100644
--- a/samples/openapi3/client/petstore/typescript/builds/deno/types/ObjectParamAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/types/ObjectParamAPI.ts
@@ -253,7 +253,7 @@ export class ObjectStoreApi {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      * @param param the request object
      */
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/deno/types/ObservableAPI.ts
index a6524a21885d..1857aba9f385 100644
--- a/samples/openapi3/client/petstore/typescript/builds/deno/types/ObservableAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/types/ObservableAPI.ts
@@ -288,7 +288,7 @@ export class ObservableStoreApi {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      * @param orderId ID of pet that needs to be fetched
      */
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/types/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/deno/types/PromiseAPI.ts
index fe3712f41296..087bc60cbe7f 100644
--- a/samples/openapi3/client/petstore/typescript/builds/deno/types/PromiseAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/types/PromiseAPI.ts
@@ -145,7 +145,7 @@ export class PromiseStoreApi {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      * @param orderId ID of pet that needs to be fetched
      */
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/StoreApi.md b/samples/openapi3/client/petstore/typescript/builds/inversify/StoreApi.md
index 9dfad28caff6..b7d89db061fc 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/StoreApi.md
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/StoreApi.md
@@ -116,7 +116,7 @@ This endpoint does not need any parameter.
 # **getOrderById**
 > Order getOrderById()
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/StoreApi.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/StoreApi.ts
index 8c67bb3abe47..7537e2b4eccc 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/StoreApi.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/StoreApi.ts
@@ -74,7 +74,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      * @param orderId ID of pet that needs to be fetched
      */
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/services/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/services/ObjectParamAPI.ts
index 87e9efed41db..09bf61437b22 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/services/ObjectParamAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/services/ObjectParamAPI.ts
@@ -86,7 +86,7 @@ export abstract class AbstractObjectStoreApi {
     public abstract getInventory(param: req.StoreApiGetInventoryRequest, options?: Configuration): Promise<{ [key: string]: number; }>;
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      * @param param the request object
      */
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObjectParamAPI.ts
index acc26d9ef93a..41dfaebdde1d 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObjectParamAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObjectParamAPI.ts
@@ -253,7 +253,7 @@ export class ObjectStoreApi {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      * @param param the request object
      */
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObservableAPI.ts
index ac5eeb4ce53c..c3c1dc415160 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObservableAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObservableAPI.ts
@@ -296,7 +296,7 @@ export class ObservableStoreApi {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      * @param orderId ID of pet that needs to be fetched
      */
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/types/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/types/PromiseAPI.ts
index cf94fea92a8d..d1ade068256a 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/types/PromiseAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/types/PromiseAPI.ts
@@ -153,7 +153,7 @@ export class PromiseStoreApi {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      * @param orderId ID of pet that needs to be fetched
      */
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/StoreApi.md b/samples/openapi3/client/petstore/typescript/builds/jquery/StoreApi.md
index 9dfad28caff6..b7d89db061fc 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/StoreApi.md
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/StoreApi.md
@@ -116,7 +116,7 @@ This endpoint does not need any parameter.
 # **getOrderById**
 > Order getOrderById()
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/StoreApi.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/StoreApi.ts
index c60c1d870815..31cf3aa1f55e 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/StoreApi.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/StoreApi.ts
@@ -78,7 +78,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      * @param orderId ID of pet that needs to be fetched
      */
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/types/APIInterfaces.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/types/APIInterfaces.ts
index 370e025aa041..c00a02247b66 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/types/APIInterfaces.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/types/APIInterfaces.ts
@@ -90,7 +90,7 @@ export interface GenericStoreApiInterface {
     getInventory(options?: Configuration): T2;
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      * @param orderId ID of pet that needs to be fetched
      */
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObjectParamAPI.ts
index acc26d9ef93a..41dfaebdde1d 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObjectParamAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObjectParamAPI.ts
@@ -253,7 +253,7 @@ export class ObjectStoreApi {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      * @param param the request object
      */
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObservableAPI.ts
index b5b9a542b245..5e9397ea69f6 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObservableAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObservableAPI.ts
@@ -288,7 +288,7 @@ export class ObservableStoreApi {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      * @param orderId ID of pet that needs to be fetched
      */
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/types/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/types/PromiseAPI.ts
index 7279c47febdd..c86ac4a84f38 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/types/PromiseAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/types/PromiseAPI.ts
@@ -145,7 +145,7 @@ export class PromiseStoreApi {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      * @param orderId ID of pet that needs to be fetched
      */
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/StoreApi.md b/samples/openapi3/client/petstore/typescript/builds/object_params/StoreApi.md
index 9dfad28caff6..b7d89db061fc 100644
--- a/samples/openapi3/client/petstore/typescript/builds/object_params/StoreApi.md
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/StoreApi.md
@@ -116,7 +116,7 @@ This endpoint does not need any parameter.
 # **getOrderById**
 > Order getOrderById()
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/StoreApi.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/StoreApi.ts
index 2682c0fc70a8..3bb0a2de754e 100644
--- a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/StoreApi.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/StoreApi.ts
@@ -80,7 +80,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      * @param orderId ID of pet that needs to be fetched
      */
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObjectParamAPI.ts
index acc26d9ef93a..41dfaebdde1d 100644
--- a/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObjectParamAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObjectParamAPI.ts
@@ -253,7 +253,7 @@ export class ObjectStoreApi {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      * @param param the request object
      */
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObservableAPI.ts
index b5b9a542b245..5e9397ea69f6 100644
--- a/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObservableAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObservableAPI.ts
@@ -288,7 +288,7 @@ export class ObservableStoreApi {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      * @param orderId ID of pet that needs to be fetched
      */
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/types/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/types/PromiseAPI.ts
index 7279c47febdd..c86ac4a84f38 100644
--- a/samples/openapi3/client/petstore/typescript/builds/object_params/types/PromiseAPI.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/types/PromiseAPI.ts
@@ -145,7 +145,7 @@ export class PromiseStoreApi {
     }
 
     /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Find purchase order by ID
      * @param orderId ID of pet that needs to be fetched
      */
diff --git a/samples/openapi3/client/petstore/typescript/tests/browser/test/PetApi.test.ts b/samples/openapi3/client/petstore/typescript/tests/browser/test/PetApi.test.ts
index 78d07519cbe4..a4334fe7457a 100644
--- a/samples/openapi3/client/petstore/typescript/tests/browser/test/PetApi.test.ts
+++ b/samples/openapi3/client/petstore/typescript/tests/browser/test/PetApi.test.ts
@@ -51,11 +51,11 @@ describe("PetApi", () => {
         throw new Error("Pet with id " + deletedPet.id + " was not deleted!");
     })
 
-    it("deleteNonExistantPet", async () => {
+    it("deleteNonExistentPet", async () => {
         // Use an id that is too big for the server to handle.
-        const nonExistantId = 100000000000000000000000000.0;
+        const nonExistentId = 100000000000000000000000000.0;
         try {
-            await petApi.deletePet(nonExistantId)
+            await petApi.deletePet(nonExistentId)
         } catch (error) {
             const err = error as ApiException;
             // The 404 response for this endpoint is officially documented, but
@@ -68,7 +68,7 @@ describe("PetApi", () => {
             expect(err.body).to.include("message");
             return;
         }
-        throw new Error("Deleted non-existant pet with id " + nonExistantId + "!");
+        throw new Error("Deleted non-existent pet with id " + nonExistentId + "!");
     })
 
     it("failRunTimeRequiredParameterCheck", async () => {
diff --git a/samples/openapi3/client/petstore/typescript/tests/default/test/api/PetApi.test.ts b/samples/openapi3/client/petstore/typescript/tests/default/test/api/PetApi.test.ts
index 4d52bcc20f96..dd6cfbc3763c 100644
--- a/samples/openapi3/client/petstore/typescript/tests/default/test/api/PetApi.test.ts
+++ b/samples/openapi3/client/petstore/typescript/tests/default/test/api/PetApi.test.ts
@@ -42,11 +42,11 @@ describe("PetApi", () => {
         throw new Error("Pet with id " + deletedPet.id + " was not deleted!");
     })
 
-    it("deleteNonExistantPet", async () => {
+    it("deleteNonExistentPet", async () => {
         // Use an id that is too big for the server to handle.
-        const nonExistantId = 100000000000000000000000000;
+        const nonExistentId = 100000000000000000000000000;
         try {
-            await petApi.deletePet(nonExistantId)
+            await petApi.deletePet(nonExistentId)
         } catch (err) {
             // The 404 response for this endpoint is officially documented, but
             // that documentation is not used for generating the client code.
@@ -58,7 +58,7 @@ describe("PetApi", () => {
             expect(err.body).to.include("message");
             return;
         }
-        throw new Error("Deleted non-existant pet with id " + nonExistantId + "!");
+        throw new Error("Deleted non-existent pet with id " + nonExistentId + "!");
     })
 
     it("failRunTimeRequiredParameterCheck", async () => {
diff --git a/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApi.kt
index acfb3f62ae03..f14d44213c76 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApi.kt
+++ b/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApi.kt
@@ -70,7 +70,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic
     @ApiOperation(
         value = "Find purchase order by ID",
         nickname = "getOrderById",
-        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         response = Order::class)
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation", response = Order::class),ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Order not found")])
diff --git a/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/test/kotlin/org/openapitools/api/StoreApiTest.kt b/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/test/kotlin/org/openapitools/api/StoreApiTest.kt
index b084fe87b493..438fc7078bcb 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/test/kotlin/org/openapitools/api/StoreApiTest.kt
+++ b/samples/openapi3/server/petstore/kotlin-springboot-reactive/src/test/kotlin/org/openapitools/api/StoreApiTest.kt
@@ -47,7 +47,7 @@ class StoreApiTest {
     /**
     * Find purchase order by ID
     *
-    * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
     *
     * @throws ApiException
     *          if the Api call fails
diff --git a/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApi.kt
index 9199ce4e307b..1992a5d8e0d4 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApi.kt
+++ b/samples/openapi3/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApi.kt
@@ -69,7 +69,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic
     @ApiOperation(
         value = "Find purchase order by ID",
         nickname = "getOrderById",
-        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         response = Order::class)
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation", response = Order::class),ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Order not found")])
diff --git a/samples/openapi3/server/petstore/kotlin-springboot/src/test/kotlin/org/openapitools/api/StoreApiTest.kt b/samples/openapi3/server/petstore/kotlin-springboot/src/test/kotlin/org/openapitools/api/StoreApiTest.kt
index 423f98d297f6..2fdab9d2d765 100644
--- a/samples/openapi3/server/petstore/kotlin-springboot/src/test/kotlin/org/openapitools/api/StoreApiTest.kt
+++ b/samples/openapi3/server/petstore/kotlin-springboot/src/test/kotlin/org/openapitools/api/StoreApiTest.kt
@@ -45,7 +45,7 @@ class StoreApiTest {
     /**
     * Find purchase order by ID
     *
-    * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
     *
     * @throws ApiException
     *          if the Api call fails
diff --git a/samples/openapi3/server/petstore/php-symfony/SymfonyBundle-php/Resources/docs/Api/StoreApiInterface.md b/samples/openapi3/server/petstore/php-symfony/SymfonyBundle-php/Resources/docs/Api/StoreApiInterface.md
index 3d3e3b18c3ef..7a0c04623186 100644
--- a/samples/openapi3/server/petstore/php-symfony/SymfonyBundle-php/Resources/docs/Api/StoreApiInterface.md
+++ b/samples/openapi3/server/petstore/php-symfony/SymfonyBundle-php/Resources/docs/Api/StoreApiInterface.md
@@ -140,7 +140,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example Implementation
 ```php
diff --git a/samples/openapi3/server/petstore/python-flask-python2/git_push.sh b/samples/openapi3/server/petstore/python-flask-python2/git_push.sh
index ced3be2b0c7b..200e975d2120 100644
--- a/samples/openapi3/server/petstore/python-flask-python2/git_push.sh
+++ b/samples/openapi3/server/petstore/python-flask-python2/git_push.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update" "gitlab.com"
 
 git_user_id=$1
 git_repo_id=$2
diff --git a/samples/openapi3/server/petstore/python-flask-python2/openapi_server/controllers/store_controller.py b/samples/openapi3/server/petstore/python-flask-python2/openapi_server/controllers/store_controller.py
index 3d16d99859e7..7e58cf96c232 100644
--- a/samples/openapi3/server/petstore/python-flask-python2/openapi_server/controllers/store_controller.py
+++ b/samples/openapi3/server/petstore/python-flask-python2/openapi_server/controllers/store_controller.py
@@ -32,7 +32,7 @@ def get_inventory():  # noqa: E501
 def get_order_by_id(order_id):  # noqa: E501
     """Find purchase order by ID
 
-    For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions # noqa: E501
+    For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions # noqa: E501
 
     :param order_id: ID of pet that needs to be fetched
     :type order_id: int
diff --git a/samples/openapi3/server/petstore/python-flask-python2/openapi_server/openapi/openapi.yaml b/samples/openapi3/server/petstore/python-flask-python2/openapi_server/openapi/openapi.yaml
index 31100fda5278..2257a3886817 100644
--- a/samples/openapi3/server/petstore/python-flask-python2/openapi_server/openapi/openapi.yaml
+++ b/samples/openapi3/server/petstore/python-flask-python2/openapi_server/openapi/openapi.yaml
@@ -367,7 +367,7 @@ paths:
       x-openapi-router-controller: openapi_server.controllers.store_controller
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: get_order_by_id
       parameters:
       - description: ID of pet that needs to be fetched
@@ -495,7 +495,7 @@ paths:
                 type: integer
               style: simple
             X-Expires-After:
-              description: date in UTC when toekn expires
+              description: date in UTC when token expires
               explode: false
               schema:
                 format: date-time
diff --git a/samples/openapi3/server/petstore/python-flask-python2/openapi_server/test/test_pet_controller.py b/samples/openapi3/server/petstore/python-flask-python2/openapi_server/test/test_pet_controller.py
index 6c031e9f4b10..dd1af2102577 100644
--- a/samples/openapi3/server/petstore/python-flask-python2/openapi_server/test/test_pet_controller.py
+++ b/samples/openapi3/server/petstore/python-flask-python2/openapi_server/test/test_pet_controller.py
@@ -17,7 +17,7 @@
 class TestPetController(BaseTestCase):
     """PetController integration test stubs"""
 
-    @unittest.skip("Connexion does not support multiple consummes. See https://github.com/zalando/connexion/pull/760")
+    @unittest.skip("Connexion does not support multiple consumes. See https://github.com/zalando/connexion/pull/760")
     def test_add_pet(self):
         """Test case for add_pet
 
@@ -121,7 +121,7 @@ def test_get_pet_by_id(self):
         self.assert200(response,
                        'Response body is : ' + response.data.decode('utf-8'))
 
-    @unittest.skip("Connexion does not support multiple consummes. See https://github.com/zalando/connexion/pull/760")
+    @unittest.skip("Connexion does not support multiple consumes. See https://github.com/zalando/connexion/pull/760")
     def test_update_pet(self):
         """Test case for update_pet
 
diff --git a/samples/openapi3/server/petstore/python-flask/git_push.sh b/samples/openapi3/server/petstore/python-flask/git_push.sh
index ced3be2b0c7b..200e975d2120 100644
--- a/samples/openapi3/server/petstore/python-flask/git_push.sh
+++ b/samples/openapi3/server/petstore/python-flask/git_push.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update" "gitlab.com"
 
 git_user_id=$1
 git_repo_id=$2
diff --git a/samples/openapi3/server/petstore/python-flask/openapi_server/controllers/store_controller.py b/samples/openapi3/server/petstore/python-flask/openapi_server/controllers/store_controller.py
index 3d16d99859e7..7e58cf96c232 100644
--- a/samples/openapi3/server/petstore/python-flask/openapi_server/controllers/store_controller.py
+++ b/samples/openapi3/server/petstore/python-flask/openapi_server/controllers/store_controller.py
@@ -32,7 +32,7 @@ def get_inventory():  # noqa: E501
 def get_order_by_id(order_id):  # noqa: E501
     """Find purchase order by ID
 
-    For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions # noqa: E501
+    For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions # noqa: E501
 
     :param order_id: ID of pet that needs to be fetched
     :type order_id: int
diff --git a/samples/openapi3/server/petstore/python-flask/openapi_server/openapi/openapi.yaml b/samples/openapi3/server/petstore/python-flask/openapi_server/openapi/openapi.yaml
index 31100fda5278..2257a3886817 100644
--- a/samples/openapi3/server/petstore/python-flask/openapi_server/openapi/openapi.yaml
+++ b/samples/openapi3/server/petstore/python-flask/openapi_server/openapi/openapi.yaml
@@ -367,7 +367,7 @@ paths:
       x-openapi-router-controller: openapi_server.controllers.store_controller
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: get_order_by_id
       parameters:
       - description: ID of pet that needs to be fetched
@@ -495,7 +495,7 @@ paths:
                 type: integer
               style: simple
             X-Expires-After:
-              description: date in UTC when toekn expires
+              description: date in UTC when token expires
               explode: false
               schema:
                 format: date-time
diff --git a/samples/openapi3/server/petstore/python-flask/openapi_server/test/test_pet_controller.py b/samples/openapi3/server/petstore/python-flask/openapi_server/test/test_pet_controller.py
index 2e9944b3cc33..a51734729375 100644
--- a/samples/openapi3/server/petstore/python-flask/openapi_server/test/test_pet_controller.py
+++ b/samples/openapi3/server/petstore/python-flask/openapi_server/test/test_pet_controller.py
@@ -17,7 +17,7 @@
 class TestPetController(BaseTestCase):
     """PetController integration test stubs"""
 
-    @unittest.skip("Connexion does not support multiple consummes. See https://github.com/zalando/connexion/pull/760")
+    @unittest.skip("Connexion does not support multiple consumes. See https://github.com/zalando/connexion/pull/760")
     def test_add_pet(self):
         """Test case for add_pet
 
@@ -121,7 +121,7 @@ def test_get_pet_by_id(self):
         self.assert200(response,
                        'Response body is : ' + response.data.decode('utf-8'))
 
-    @unittest.skip("Connexion does not support multiple consummes. See https://github.com/zalando/connexion/pull/760")
+    @unittest.skip("Connexion does not support multiple consumes. See https://github.com/zalando/connexion/pull/760")
     def test_update_pet(self):
         """Test case for update_pet
 
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Addressable.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Addressable.java
index 2cc692ebfcb3..950befc2fcbd 100644
--- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Addressable.java
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Addressable.java
@@ -15,10 +15,10 @@
 import javax.annotation.Generated;
 
 /**
- * Base schema for adressable entities
+ * Base schema for addressable entities
  */
 
-@Schema(name = "Addressable", description = "Base schema for adressable entities")
+@Schema(name = "Addressable", description = "Base schema for addressable entities")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Addressable {
 
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/resources/openapi.yaml
index 9ab9dccf5dfc..d0b65c858631 100644
--- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/resources/openapi.yaml
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/resources/openapi.yaml
@@ -97,7 +97,7 @@ components:
       description: Success
   schemas:
     Addressable:
-      description: Base schema for adressable entities
+      description: Base schema for addressable entities
       properties:
         href:
           description: Hyperlink reference
diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java
index 6d2330a325ad..748f4f5cc36a 100644
--- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java
@@ -102,7 +102,7 @@ default ResponseEntity> getInventory(
 
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/resources/openapi.yaml
index b629acd9d7f6..ce4ba1e4a4ea 100644
--- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/resources/openapi.yaml
+++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/resources/openapi.yaml
@@ -386,7 +386,7 @@ paths:
       - tag: store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java
index d0eed779fd05..e9e58af2abe5 100644
--- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java
@@ -102,7 +102,7 @@ default ResponseEntity> getInventory(
 
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot-3/src/main/resources/openapi.yaml
index b629acd9d7f6..ce4ba1e4a4ea 100644
--- a/samples/openapi3/server/petstore/springboot-3/src/main/resources/openapi.yaml
+++ b/samples/openapi3/server/petstore/springboot-3/src/main/resources/openapi.yaml
@@ -386,7 +386,7 @@ paths:
       - tag: store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java
index 8dcbbff9a021..c640ac479d7d 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java
@@ -409,14 +409,14 @@ default ResponseEntity testEnumParameters(
      * @param stringGroup String in group parameters (optional)
      * @param booleanGroup Boolean in group parameters (optional)
      * @param int64Group Integer in group parameters (optional)
-     * @return Someting wrong (status code 400)
+     * @return Something wrong (status code 400)
      */
     @Operation(
         operationId = "testGroupParameters",
         summary = "Fake endpoint to test group parameters (optional)",
         tags = { "fake" },
         responses = {
-            @ApiResponse(responseCode = "400", description = "Someting wrong")
+            @ApiResponse(responseCode = "400", description = "Something wrong")
         }
     )
     @RequestMapping(
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java
index 836aa2500f7f..77f6a5e38686 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java
@@ -102,7 +102,7 @@ default ResponseEntity> getInventory(
 
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml
index 2999e6f2f8d6..658d8a96b30b 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml
@@ -392,7 +392,7 @@ paths:
       - tag: store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -714,7 +714,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java
index 21888ab0e8dd..ae9085e66e15 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java
@@ -377,14 +377,14 @@ default ResponseEntity testEnumParameters(
      * @param stringGroup String in group parameters (optional)
      * @param booleanGroup Boolean in group parameters (optional)
      * @param int64Group Integer in group parameters (optional)
-     * @return Someting wrong (status code 400)
+     * @return Something wrong (status code 400)
      */
     @Operation(
         operationId = "testGroupParameters",
         summary = "Fake endpoint to test group parameters (optional)",
         tags = { "fake" },
         responses = {
-            @ApiResponse(responseCode = "400", description = "Someting wrong")
+            @ApiResponse(responseCode = "400", description = "Something wrong")
         }
     )
     @RequestMapping(
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java
index 03f67c302ce9..2cd684b90f5c 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java
@@ -234,7 +234,7 @@ default ResponseEntity testEnumParameters(List enumHeaderStringArr
      * @param stringGroup String in group parameters (optional)
      * @param booleanGroup Boolean in group parameters (optional)
      * @param int64Group Integer in group parameters (optional)
-     * @return Someting wrong (status code 400)
+     * @return Something wrong (status code 400)
      * @see FakeApi#testGroupParameters
      */
     default ResponseEntity testGroupParameters(Integer requiredStringGroup,
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java
index a54fc47aec06..80be70f876c6 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java
@@ -96,7 +96,7 @@ default ResponseEntity> getInventory(
 
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java
index e9b7146b52a8..c4c812a9bb25 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java
@@ -52,7 +52,7 @@ default ResponseEntity> getInventory() {
 
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot-delegate/src/main/resources/openapi.yaml
index 2999e6f2f8d6..658d8a96b30b 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/resources/openapi.yaml
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/resources/openapi.yaml
@@ -392,7 +392,7 @@ paths:
       - tag: store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -714,7 +714,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java
index b408fc5c062b..c54f65aab405 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java
@@ -407,14 +407,14 @@ default ResponseEntity testEnumParameters(
      * @param requiredInt64Group Required Integer in group parameters (required)
      * @param stringGroup String in group parameters (optional)
      * @param int64Group Integer in group parameters (optional)
-     * @return Someting wrong (status code 400)
+     * @return Something wrong (status code 400)
      */
     @Operation(
         operationId = "testGroupParameters",
         summary = "Fake endpoint to test group parameters (optional)",
         tags = { "fake" },
         responses = {
-            @ApiResponse(responseCode = "400", description = "Someting wrong")
+            @ApiResponse(responseCode = "400", description = "Something wrong")
         }
     )
     @Parameters({
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java
index 836aa2500f7f..77f6a5e38686 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java
@@ -102,7 +102,7 @@ default ResponseEntity> getInventory(
 
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml
index 2999e6f2f8d6..658d8a96b30b 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml
@@ -392,7 +392,7 @@ paths:
       - tag: store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -714,7 +714,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java
index 1a9631a15ada..dd7a16a827b0 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java
@@ -391,14 +391,14 @@ default Mono> testEnumParameters(
      * @param stringGroup String in group parameters (optional)
      * @param booleanGroup Boolean in group parameters (optional)
      * @param int64Group Integer in group parameters (optional)
-     * @return Someting wrong (status code 400)
+     * @return Something wrong (status code 400)
      */
     @Operation(
         operationId = "testGroupParameters",
         summary = "Fake endpoint to test group parameters (optional)",
         tags = { "fake" },
         responses = {
-            @ApiResponse(responseCode = "400", description = "Someting wrong")
+            @ApiResponse(responseCode = "400", description = "Something wrong")
         }
     )
     @RequestMapping(
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java
index 611aad3212a2..98fba4fc3d0c 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java
@@ -264,7 +264,7 @@ default Mono> testEnumParameters(List enumHeaderStr
      * @param stringGroup String in group parameters (optional)
      * @param booleanGroup Boolean in group parameters (optional)
      * @param int64Group Integer in group parameters (optional)
-     * @return Someting wrong (status code 400)
+     * @return Something wrong (status code 400)
      * @see FakeApi#testGroupParameters
      */
     default Mono> testGroupParameters(Integer requiredStringGroup,
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java
index 3e9c0e7217e2..9c42b929a1f0 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java
@@ -101,7 +101,7 @@ default Mono>> getInventory(
 
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java
index cc442cd3ae45..ec665c3cd612 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java
@@ -61,7 +61,7 @@ default Mono>> getInventory(ServerWebExchang
 
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot-reactive/src/main/resources/openapi.yaml
index 2999e6f2f8d6..658d8a96b30b 100644
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/resources/openapi.yaml
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/resources/openapi.yaml
@@ -392,7 +392,7 @@ paths:
       - tag: store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -714,7 +714,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java
index 3044b699b0d0..0272594908a5 100644
--- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java
@@ -71,7 +71,7 @@ default ResponseEntity> getInventory(
 
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot-source/src/main/resources/openapi.yaml
index b629acd9d7f6..ce4ba1e4a4ea 100644
--- a/samples/openapi3/server/petstore/springboot-source/src/main/resources/openapi.yaml
+++ b/samples/openapi3/server/petstore/springboot-source/src/main/resources/openapi.yaml
@@ -386,7 +386,7 @@ paths:
       - tag: store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java
index fcfa5b29f408..acef662cd11a 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java
@@ -409,14 +409,14 @@ default ResponseEntity testEnumParameters(
      * @param stringGroup String in group parameters (optional)
      * @param booleanGroup Boolean in group parameters (optional)
      * @param int64Group Integer in group parameters (optional)
-     * @return Someting wrong (status code 400)
+     * @return Something wrong (status code 400)
      */
     @Operation(
         operationId = "testGroupParameters",
         summary = "Fake endpoint to test group parameters (optional)",
         tags = { "fake" },
         responses = {
-            @ApiResponse(responseCode = "400", description = "Someting wrong")
+            @ApiResponse(responseCode = "400", description = "Something wrong")
         }
     )
     @RequestMapping(
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java
index 836aa2500f7f..77f6a5e38686 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java
@@ -102,7 +102,7 @@ default ResponseEntity> getInventory(
 
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml
index 2999e6f2f8d6..658d8a96b30b 100644
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml
@@ -392,7 +392,7 @@ paths:
       - tag: store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -714,7 +714,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java
index 6dec1f26bb13..f3d4f3b21f72 100644
--- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java
@@ -103,7 +103,7 @@ default ResponseEntity> getInventory(
 
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
diff --git a/samples/openapi3/server/petstore/springboot/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot/src/main/resources/openapi.yaml
index b629acd9d7f6..ce4ba1e4a4ea 100644
--- a/samples/openapi3/server/petstore/springboot/src/main/resources/openapi.yaml
+++ b/samples/openapi3/server/petstore/springboot/src/main/resources/openapi.yaml
@@ -386,7 +386,7 @@ paths:
       - tag: store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
diff --git a/samples/schema/petstore/wsdl-schema/service.wsdl b/samples/schema/petstore/wsdl-schema/service.wsdl
index db34eda9eb3c..fe115de068f3 100644
--- a/samples/schema/petstore/wsdl-schema/service.wsdl
+++ b/samples/schema/petstore/wsdl-schema/service.wsdl
@@ -836,7 +836,7 @@
       
     
     
-      For valid response try integer IDs with value >= 1 and <= 10.         Other values will generated exceptions
+      For valid response try integer IDs with value >= 1 and <= 10.         Other values will generate exceptions
       
       
         successful operation
diff --git a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/StoreApi.cs b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/StoreApi.cs
index 31f24ebfc78d..b925426c761d 100644
--- a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/StoreApi.cs
+++ b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/StoreApi.cs
@@ -78,7 +78,7 @@ public virtual IActionResult GetInventory()
         /// 
         /// Find purchase order by ID
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// ID of pet that needs to be fetched
         /// successful operation
         /// Invalid ID supplied
diff --git a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/wwwroot/openapi-original.json b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/wwwroot/openapi-original.json
index 257358c0608a..0ccbb4c793c6 100644
--- a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/wwwroot/openapi-original.json
+++ b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/wwwroot/openapi-original.json
@@ -458,7 +458,7 @@
         "tags" : [ "store" ]
       },
       "get" : {
-        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         "operationId" : "getOrderById",
         "parameters" : [ {
           "description" : "ID of pet that needs to be fetched",
diff --git a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/StoreApi.cs b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/StoreApi.cs
index 31f24ebfc78d..b925426c761d 100644
--- a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/StoreApi.cs
+++ b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/StoreApi.cs
@@ -78,7 +78,7 @@ public virtual IActionResult GetInventory()
         /// 
         /// Find purchase order by ID
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// ID of pet that needs to be fetched
         /// successful operation
         /// Invalid ID supplied
diff --git a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/wwwroot/openapi-original.json b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/wwwroot/openapi-original.json
index 257358c0608a..0ccbb4c793c6 100644
--- a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/wwwroot/openapi-original.json
+++ b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/wwwroot/openapi-original.json
@@ -458,7 +458,7 @@
         "tags" : [ "store" ]
       },
       "get" : {
-        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         "operationId" : "getOrderById",
         "parameters" : [ {
           "description" : "ID of pet that needs to be fetched",
diff --git a/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Controllers/StoreApi.cs b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Controllers/StoreApi.cs
index 31f24ebfc78d..b925426c761d 100644
--- a/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Controllers/StoreApi.cs
+++ b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Controllers/StoreApi.cs
@@ -78,7 +78,7 @@ public virtual IActionResult GetInventory()
         /// 
         /// Find purchase order by ID
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// ID of pet that needs to be fetched
         /// successful operation
         /// Invalid ID supplied
diff --git a/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/wwwroot/openapi-original.json b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/wwwroot/openapi-original.json
index 257358c0608a..0ccbb4c793c6 100644
--- a/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/wwwroot/openapi-original.json
+++ b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/wwwroot/openapi-original.json
@@ -458,7 +458,7 @@
         "tags" : [ "store" ]
       },
       "get" : {
-        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         "operationId" : "getOrderById",
         "parameters" : [ {
           "description" : "ID of pet that needs to be fetched",
diff --git a/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Controllers/StoreApi.cs b/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Controllers/StoreApi.cs
index 31f24ebfc78d..b925426c761d 100644
--- a/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Controllers/StoreApi.cs
+++ b/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Controllers/StoreApi.cs
@@ -78,7 +78,7 @@ public virtual IActionResult GetInventory()
         /// 
         /// Find purchase order by ID
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// ID of pet that needs to be fetched
         /// successful operation
         /// Invalid ID supplied
diff --git a/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/wwwroot/openapi-original.json b/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/wwwroot/openapi-original.json
index 257358c0608a..0ccbb4c793c6 100644
--- a/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/wwwroot/openapi-original.json
+++ b/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/wwwroot/openapi-original.json
@@ -458,7 +458,7 @@
         "tags" : [ "store" ]
       },
       "get" : {
-        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         "operationId" : "getOrderById",
         "parameters" : [ {
           "description" : "ID of pet that needs to be fetched",
diff --git a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Controllers/StoreApi.cs b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Controllers/StoreApi.cs
index 31f24ebfc78d..b925426c761d 100644
--- a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Controllers/StoreApi.cs
+++ b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Controllers/StoreApi.cs
@@ -78,7 +78,7 @@ public virtual IActionResult GetInventory()
         /// 
         /// Find purchase order by ID
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// ID of pet that needs to be fetched
         /// successful operation
         /// Invalid ID supplied
diff --git a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/wwwroot/openapi-original.json b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/wwwroot/openapi-original.json
index 257358c0608a..0ccbb4c793c6 100644
--- a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/wwwroot/openapi-original.json
+++ b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/wwwroot/openapi-original.json
@@ -458,7 +458,7 @@
         "tags" : [ "store" ]
       },
       "get" : {
-        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         "operationId" : "getOrderById",
         "parameters" : [ {
           "description" : "ID of pet that needs to be fetched",
diff --git a/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Controllers/StoreApi.cs b/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Controllers/StoreApi.cs
index 31f24ebfc78d..b925426c761d 100644
--- a/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Controllers/StoreApi.cs
+++ b/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Controllers/StoreApi.cs
@@ -78,7 +78,7 @@ public virtual IActionResult GetInventory()
         /// 
         /// Find purchase order by ID
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// ID of pet that needs to be fetched
         /// successful operation
         /// Invalid ID supplied
diff --git a/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/wwwroot/openapi-original.json b/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/wwwroot/openapi-original.json
index 257358c0608a..0ccbb4c793c6 100644
--- a/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/wwwroot/openapi-original.json
+++ b/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/wwwroot/openapi-original.json
@@ -458,7 +458,7 @@
         "tags" : [ "store" ]
       },
       "get" : {
-        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         "operationId" : "getOrderById",
         "parameters" : [ {
           "description" : "ID of pet that needs to be fetched",
diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/StoreApi.cs b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/StoreApi.cs
index f815bf39011f..8e493e399264 100644
--- a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/StoreApi.cs
+++ b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/StoreApi.cs
@@ -78,7 +78,7 @@ public virtual IActionResult GetInventory()
         /// 
         /// Find purchase order by ID
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// ID of pet that needs to be fetched
         /// successful operation
         /// Invalid ID supplied
diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/wwwroot/openapi-original.json b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/wwwroot/openapi-original.json
index 81d9cb2a73d4..333dcf2bfceb 100644
--- a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/wwwroot/openapi-original.json
+++ b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/wwwroot/openapi-original.json
@@ -446,7 +446,7 @@
         "tags" : [ "store" ]
       },
       "get" : {
-        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         "operationId" : "getOrderById",
         "parameters" : [ {
           "description" : "ID of pet that needs to be fetched",
diff --git a/samples/server/petstore/aspnetcore3/src/Org.OpenAPITools/Controllers/StoreApi.cs b/samples/server/petstore/aspnetcore3/src/Org.OpenAPITools/Controllers/StoreApi.cs
index fa909a61a146..4ec7250e14fe 100644
--- a/samples/server/petstore/aspnetcore3/src/Org.OpenAPITools/Controllers/StoreApi.cs
+++ b/samples/server/petstore/aspnetcore3/src/Org.OpenAPITools/Controllers/StoreApi.cs
@@ -77,7 +77,7 @@ public virtual IActionResult GetInventory()
         /// 
         /// Find purchase order by ID
         /// 
-        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+        /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
         /// ID of pet that needs to be fetched
         /// successful operation
         /// Invalid ID supplied
diff --git a/samples/server/petstore/aspnetcore3/src/Org.OpenAPITools/wwwroot/openapi-original.json b/samples/server/petstore/aspnetcore3/src/Org.OpenAPITools/wwwroot/openapi-original.json
index c72a9d39daa2..c275869fc6d2 100644
--- a/samples/server/petstore/aspnetcore3/src/Org.OpenAPITools/wwwroot/openapi-original.json
+++ b/samples/server/petstore/aspnetcore3/src/Org.OpenAPITools/wwwroot/openapi-original.json
@@ -465,7 +465,7 @@
         "tags" : [ "store" ]
       },
       "get" : {
-        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         "operationId" : "getOrderById",
         "parameters" : [ {
           "description" : "ID of pet that needs to be fetched",
@@ -634,7 +634,7 @@
                 }
               },
               "X-Expires-After" : {
-                "description" : "date in UTC when toekn expires",
+                "description" : "date in UTC when token expires",
                 "schema" : {
                   "format" : "date-time",
                   "type" : "string"
diff --git a/samples/server/petstore/cpp-pistache/api/StoreApi.h b/samples/server/petstore/cpp-pistache/api/StoreApi.h
index f6419da20f55..c12d56ebe277 100644
--- a/samples/server/petstore/cpp-pistache/api/StoreApi.h
+++ b/samples/server/petstore/cpp-pistache/api/StoreApi.h
@@ -85,7 +85,7 @@ class  StoreApi {
     /// Find purchase order by ID
     /// 

     /// 
-    /// For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    /// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
     /// 
     /// ID of pet that needs to be fetched
     virtual void get_order_by_id(const int64_t &orderId, Pistache::Http::ResponseWriter &response) = 0;
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.cpp
index 07ced7c08c3c..29959cec0c6e 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.cpp
@@ -1515,7 +1515,7 @@ void FakeResource::handler_DELETE_internal(const std::shared_ptr 10. Other values will generated exceptions",
+        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         "operationId" : "getOrderById",
         "parameters" : [ {
           "description" : "ID of pet that needs to be fetched",
diff --git a/samples/server/petstore/go-api-server/api/openapi.yaml b/samples/server/petstore/go-api-server/api/openapi.yaml
index f96f3d8027a0..6c5ca4308aaa 100644
--- a/samples/server/petstore/go-api-server/api/openapi.yaml
+++ b/samples/server/petstore/go-api-server/api/openapi.yaml
@@ -348,7 +348,7 @@ paths:
       - store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
diff --git a/samples/server/petstore/go-chi-server/api/openapi.yaml b/samples/server/petstore/go-chi-server/api/openapi.yaml
index f96f3d8027a0..6c5ca4308aaa 100644
--- a/samples/server/petstore/go-chi-server/api/openapi.yaml
+++ b/samples/server/petstore/go-chi-server/api/openapi.yaml
@@ -348,7 +348,7 @@ paths:
       - store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
diff --git a/samples/server/petstore/go-echo-server/.docs/api/openapi.yaml b/samples/server/petstore/go-echo-server/.docs/api/openapi.yaml
index f96f3d8027a0..6c5ca4308aaa 100644
--- a/samples/server/petstore/go-echo-server/.docs/api/openapi.yaml
+++ b/samples/server/petstore/go-echo-server/.docs/api/openapi.yaml
@@ -348,7 +348,7 @@ paths:
       - store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
diff --git a/samples/server/petstore/go-gin-api-server/api/openapi.yaml b/samples/server/petstore/go-gin-api-server/api/openapi.yaml
index f96f3d8027a0..6c5ca4308aaa 100644
--- a/samples/server/petstore/go-gin-api-server/api/openapi.yaml
+++ b/samples/server/petstore/go-gin-api-server/api/openapi.yaml
@@ -348,7 +348,7 @@ paths:
       - store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
diff --git a/samples/server/petstore/go-server-required/api/openapi.yaml b/samples/server/petstore/go-server-required/api/openapi.yaml
index e807fe206af5..350f69ddfd0b 100644
--- a/samples/server/petstore/go-server-required/api/openapi.yaml
+++ b/samples/server/petstore/go-server-required/api/openapi.yaml
@@ -347,7 +347,7 @@ paths:
       - store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
diff --git a/samples/server/petstore/graphql-nodejs-express-server/docs/store_api.md b/samples/server/petstore/graphql-nodejs-express-server/docs/store_api.md
index 10aac58f007e..81227aeca2c1 100644
--- a/samples/server/petstore/graphql-nodejs-express-server/docs/store_api.md
+++ b/samples/server/petstore/graphql-nodejs-express-server/docs/store_api.md
@@ -30,7 +30,7 @@ Returns a map of status codes to quantities
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 # **PlaceOrder**
 > Order PlaceOrder(body)
diff --git a/samples/server/petstore/graphql-nodejs-express-server/petstore/api/store_api.graphql b/samples/server/petstore/graphql-nodejs-express-server/petstore/api/store_api.graphql
index 28bf223d3514..261c1832b6ee 100644
--- a/samples/server/petstore/graphql-nodejs-express-server/petstore/api/store_api.graphql
+++ b/samples/server/petstore/graphql-nodejs-express-server/petstore/api/store_api.graphql
@@ -42,7 +42,7 @@ type Query {
   # @return [Int!]
   GetInventory: Int!
   # Find purchase order by ID
-  # For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+  # For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
   # @param Int! orderId ID of pet that needs to be fetched
   # @return [Order]
   GetOrderById(orderId: Int!): Order
diff --git a/samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/API.hs b/samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/API.hs
index e788e5595660..5a0b734dbace 100644
--- a/samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/API.hs
+++ b/samples/server/petstore/haskell-servant/lib/OpenAPIPetstore/API.hs
@@ -196,7 +196,7 @@ data OpenAPIPetstoreBackend a m = OpenAPIPetstoreBackend
   , uploadFile :: a -> Integer -> FormUploadFile -> m ApiResponse{- ^  -}
   , deleteOrder :: Text -> m NoContent{- ^ For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors -}
   , getInventory :: a -> m ((Map.Map String Int)){- ^ Returns a map of status codes to quantities -}
-  , getOrderById :: Integer -> m Order{- ^ For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions -}
+  , getOrderById :: Integer -> m Order{- ^ For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions -}
   , placeOrder :: Order -> m Order{- ^  -}
   , createUser :: User -> m NoContent{- ^ This can only be done by the logged in user. -}
   , createUsersWithArrayInput :: [User] -> m NoContent{- ^  -}
diff --git a/samples/server/petstore/haskell-yesod/src/Handler/Store.hs b/samples/server/petstore/haskell-yesod/src/Handler/Store.hs
index e359631ea28e..52273ac6be31 100644
--- a/samples/server/petstore/haskell-yesod/src/Handler/Store.hs
+++ b/samples/server/petstore/haskell-yesod/src/Handler/Store.hs
@@ -22,7 +22,7 @@ getStoreInventoryR = notImplemented
 
 -- | Find purchase order by ID
 --
--- For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+-- For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 -- operationId: getOrderById
 getStoreOrderByInt64R :: Int64 -- ^ ID of pet that needs to be fetched
                       -> Handler Value
diff --git a/samples/server/petstore/java-helidon-server/mp/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/mp/src/main/resources/META-INF/openapi.yml
index a599f08c0f97..7a9042f14f1c 100644
--- a/samples/server/petstore/java-helidon-server/mp/src/main/resources/META-INF/openapi.yml
+++ b/samples/server/petstore/java-helidon-server/mp/src/main/resources/META-INF/openapi.yml
@@ -412,7 +412,7 @@ paths:
       x-accepts: application/json
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -712,7 +712,7 @@ paths:
         style: form
       responses:
         "400":
-          description: Someting wrong
+          description: Something wrong
       security:
       - bearer_test: []
       summary: Fake endpoint to test group parameters (optional)
diff --git a/samples/server/petstore/java-helidon-server/se/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/se/src/main/resources/META-INF/openapi.yml
index a599f08c0f97..7a9042f14f1c 100644
--- a/samples/server/petstore/java-helidon-server/se/src/main/resources/META-INF/openapi.yml
+++ b/samples/server/petstore/java-helidon-server/se/src/main/resources/META-INF/openapi.yml
@@ -412,7 +412,7 @@ paths:
       x-accepts: application/json
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -712,7 +712,7 @@ paths:
         style: form
       responses:
         "400":
-          description: Someting wrong
+          description: Something wrong
       security:
       - bearer_test: []
       summary: Fake endpoint to test group parameters (optional)
diff --git a/samples/server/petstore/java-inflector/src/main/openapi/openapi.yaml b/samples/server/petstore/java-inflector/src/main/openapi/openapi.yaml
index 0c89ed214284..82d6b7b8bcc7 100644
--- a/samples/server/petstore/java-inflector/src/main/openapi/openapi.yaml
+++ b/samples/server/petstore/java-inflector/src/main/openapi/openapi.yaml
@@ -383,7 +383,7 @@ paths:
       x-accepts: application/json
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -685,7 +685,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/server/petstore/java-micronaut-server/docs/controllers/StoreController.md b/samples/server/petstore/java-micronaut-server/docs/controllers/StoreController.md
index f8e82ff30e76..db2aa917631d 100644
--- a/samples/server/petstore/java-micronaut-server/docs/controllers/StoreController.md
+++ b/samples/server/petstore/java-micronaut-server/docs/controllers/StoreController.md
@@ -61,7 +61,7 @@ Mono StoreController.getOrderById(orderId)
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Parameters
 Name | Type | Description  | Notes
diff --git a/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/controller/StoreController.java b/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/controller/StoreController.java
index 406b780b5a9b..c7f319e57b38 100644
--- a/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/controller/StoreController.java
+++ b/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/controller/StoreController.java
@@ -94,7 +94,7 @@ public Mono> getInventory() {
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return Order
diff --git a/samples/server/petstore/java-micronaut-server/src/test/groovy/org/openapitools/controller/StoreControllerSpec.groovy b/samples/server/petstore/java-micronaut-server/src/test/groovy/org/openapitools/controller/StoreControllerSpec.groovy
index 4af6ebfface9..98a808ccb171 100644
--- a/samples/server/petstore/java-micronaut-server/src/test/groovy/org/openapitools/controller/StoreControllerSpec.groovy
+++ b/samples/server/petstore/java-micronaut-server/src/test/groovy/org/openapitools/controller/StoreControllerSpec.groovy
@@ -127,7 +127,7 @@ class StoreControllerSpec extends Specification {
      *
      * The method should: Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * TODO fill in the parameters and test return value.
      */
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApi.java
index de8256e6923c..bd993c1f0b29 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApi.java
@@ -194,7 +194,7 @@ public Response testEnumParameters(@ApiParam(value = "Header parameter enum test
     
     @io.swagger.annotations.ApiOperation(value = "Fake endpoint to test group parameters (optional)", notes = "Fake endpoint to test group parameters (optional)", response = Void.class, tags={ "fake", })
     @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 400, message = "Someting wrong", response = Void.class) })
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Something wrong", response = Void.class) })
     public Response testGroupParameters(@ApiParam(value = "Required String in group parameters",required=true) @QueryParam("required_string_group") Integer requiredStringGroup
 ,@ApiParam(value = "Required Boolean in group parameters" ,required=true)@HeaderParam("required_boolean_group") Boolean requiredBooleanGroup
 ,@ApiParam(value = "Required Integer in group parameters",required=true) @QueryParam("required_int64_group") Long requiredInt64Group
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApi.java
index 63dd05bf4d65..8266330ccc78 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApi.java
@@ -62,7 +62,7 @@ public Response getInventory()
     @Path("/order/{order_id}")
     
     @Produces({ "application/xml", "application/json" })
-    @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class, tags={ "store", })
+    @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions", response = Order.class, tags={ "store", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class),
         
diff --git a/samples/server/petstore/java-pkmst/Readme.md b/samples/server/petstore/java-pkmst/Readme.md
index 9867e11590b6..8b1886af39f9 100644
--- a/samples/server/petstore/java-pkmst/Readme.md
+++ b/samples/server/petstore/java-pkmst/Readme.md
@@ -6,7 +6,7 @@ but can enable as your microservice capabilities needs to be extended to meet st
 PKMST feature set.
 a)Read the Swagger supplied and will create a maven project
 b)Create basic controller based on rest verb and path configured in swagger
-c)generate default unit test cose using junit
+c)generate default unit test case using junit
 d)generate all needed dependency needed to run the microservice on local
 e)generate a default manifest file that allows you to push code to cloudfoundry instance ( eg pcf , ibm bluemix etc)
 
@@ -19,7 +19,7 @@ i)Allow you to configure Oauth2 security based authorization for your microservi
 
  Additional Features
  j)generate sample cucumber file and dependency to drive your Behaviour driven development.
- k)generate gatling based performance test, which can be excuted via build pipeline like jenkins etc.
+ k)generate gatling based performance test, which can be executed via build pipeline like jenkins etc.
  
  
 Working:
diff --git a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/PetApiController.java b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/PetApiController.java
index 4e520a049fc7..179e261e4735 100644
--- a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/PetApiController.java
+++ b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/PetApiController.java
@@ -21,7 +21,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.IOException;
 /**
- * Api implemention
+ * Api implementation
  * @author pkmst
  *
  */
diff --git a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/StoreApi.java b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/StoreApi.java
index e6efb7af180e..7f8af21d7d6d 100644
--- a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/StoreApi.java
+++ b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/StoreApi.java
@@ -46,7 +46,7 @@ public interface StoreApi {
     ResponseEntity> getInventory( @RequestHeader(value = "Accept", required = false) String accept) throws Exception;
 
 
-    @ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class, tags={ "store", })
+    @ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions", response = Order.class, tags={ "store", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
diff --git a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/StoreApiController.java b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/StoreApiController.java
index 8583b8b0a562..bac810e0acfb 100644
--- a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/StoreApiController.java
+++ b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/StoreApiController.java
@@ -20,7 +20,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.IOException;
 /**
- * Api implemention
+ * Api implementation
  * @author pkmst
  *
  */
diff --git a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/UserApiController.java b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/UserApiController.java
index 409941aa9494..3ab411b8fed0 100644
--- a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/UserApiController.java
+++ b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/UserApiController.java
@@ -20,7 +20,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.IOException;
 /**
- * Api implemention
+ * Api implementation
  * @author pkmst
  *
  */
diff --git a/samples/server/petstore/java-pkmst/src/test/java/com/prokarma/pkmst/controller/StoreApiTest.java b/samples/server/petstore/java-pkmst/src/test/java/com/prokarma/pkmst/controller/StoreApiTest.java
index 923211712141..1564ff4b850a 100644
--- a/samples/server/petstore/java-pkmst/src/test/java/com/prokarma/pkmst/controller/StoreApiTest.java
+++ b/samples/server/petstore/java-pkmst/src/test/java/com/prokarma/pkmst/controller/StoreApiTest.java
@@ -74,7 +74,7 @@ public void getInventoryTest() throws Exception {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @throws Exception
      *          if the Api call fails
diff --git a/samples/server/petstore/java-play-framework-api-package-override/public/openapi.json b/samples/server/petstore/java-play-framework-api-package-override/public/openapi.json
index e5d8a0e3b07f..8b12859e6477 100644
--- a/samples/server/petstore/java-play-framework-api-package-override/public/openapi.json
+++ b/samples/server/petstore/java-play-framework-api-package-override/public/openapi.json
@@ -462,7 +462,7 @@
         "x-accepts" : "application/json"
       },
       "get" : {
-        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         "operationId" : "getOrderById",
         "parameters" : [ {
           "description" : "ID of pet that needs to be fetched",
diff --git a/samples/server/petstore/java-play-framework-async/public/openapi.json b/samples/server/petstore/java-play-framework-async/public/openapi.json
index e5d8a0e3b07f..8b12859e6477 100644
--- a/samples/server/petstore/java-play-framework-async/public/openapi.json
+++ b/samples/server/petstore/java-play-framework-async/public/openapi.json
@@ -462,7 +462,7 @@
         "x-accepts" : "application/json"
       },
       "get" : {
-        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         "operationId" : "getOrderById",
         "parameters" : [ {
           "description" : "ID of pet that needs to be fetched",
diff --git a/samples/server/petstore/java-play-framework-controller-only/public/openapi.json b/samples/server/petstore/java-play-framework-controller-only/public/openapi.json
index e5d8a0e3b07f..8b12859e6477 100644
--- a/samples/server/petstore/java-play-framework-controller-only/public/openapi.json
+++ b/samples/server/petstore/java-play-framework-controller-only/public/openapi.json
@@ -462,7 +462,7 @@
         "x-accepts" : "application/json"
       },
       "get" : {
-        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         "operationId" : "getOrderById",
         "parameters" : [ {
           "description" : "ID of pet that needs to be fetched",
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints-with-security/public/openapi.json b/samples/server/petstore/java-play-framework-fake-endpoints-with-security/public/openapi.json
index 9657373ab3de..ece66be6e44f 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints-with-security/public/openapi.json
+++ b/samples/server/petstore/java-play-framework-fake-endpoints-with-security/public/openapi.json
@@ -352,7 +352,7 @@
     },
     "securitySchemes" : {
       "petstore_token" : {
-        "description" : "security definition for using keycloak authentification with control site.",
+        "description" : "security definition for using keycloak authentication with control site.",
         "flows" : {
           "authorizationCode" : {
             "authorizationUrl" : "https://keycloak-dev.business.stingray.com/auth/realms/CSLocal/protocol/openid-connect/auth",
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/public/openapi.json b/samples/server/petstore/java-play-framework-fake-endpoints/public/openapi.json
index 2e2d45c7b324..2e6dec7bc594 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/public/openapi.json
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/public/openapi.json
@@ -477,7 +477,7 @@
         "x-accepts" : "application/json"
       },
       "get" : {
-        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         "operationId" : "getOrderById",
         "parameters" : [ {
           "description" : "ID of pet that needs to be fetched",
@@ -884,7 +884,7 @@
         "responses" : {
           "400" : {
             "content" : { },
-            "description" : "Someting wrong"
+            "description" : "Something wrong"
           }
         },
         "summary" : "Fake endpoint to test group parameters (optional)",
diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/public/openapi.json b/samples/server/petstore/java-play-framework-no-bean-validation/public/openapi.json
index e5d8a0e3b07f..8b12859e6477 100644
--- a/samples/server/petstore/java-play-framework-no-bean-validation/public/openapi.json
+++ b/samples/server/petstore/java-play-framework-no-bean-validation/public/openapi.json
@@ -462,7 +462,7 @@
         "x-accepts" : "application/json"
       },
       "get" : {
-        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         "operationId" : "getOrderById",
         "parameters" : [ {
           "description" : "ID of pet that needs to be fetched",
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/public/openapi.json b/samples/server/petstore/java-play-framework-no-exception-handling/public/openapi.json
index e5d8a0e3b07f..8b12859e6477 100644
--- a/samples/server/petstore/java-play-framework-no-exception-handling/public/openapi.json
+++ b/samples/server/petstore/java-play-framework-no-exception-handling/public/openapi.json
@@ -462,7 +462,7 @@
         "x-accepts" : "application/json"
       },
       "get" : {
-        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         "operationId" : "getOrderById",
         "parameters" : [ {
           "description" : "ID of pet that needs to be fetched",
diff --git a/samples/server/petstore/java-play-framework-no-interface/public/openapi.json b/samples/server/petstore/java-play-framework-no-interface/public/openapi.json
index e5d8a0e3b07f..8b12859e6477 100644
--- a/samples/server/petstore/java-play-framework-no-interface/public/openapi.json
+++ b/samples/server/petstore/java-play-framework-no-interface/public/openapi.json
@@ -462,7 +462,7 @@
         "x-accepts" : "application/json"
       },
       "get" : {
-        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         "operationId" : "getOrderById",
         "parameters" : [ {
           "description" : "ID of pet that needs to be fetched",
diff --git a/samples/server/petstore/java-play-framework-no-nullable/public/openapi.json b/samples/server/petstore/java-play-framework-no-nullable/public/openapi.json
index e5d8a0e3b07f..8b12859e6477 100644
--- a/samples/server/petstore/java-play-framework-no-nullable/public/openapi.json
+++ b/samples/server/petstore/java-play-framework-no-nullable/public/openapi.json
@@ -462,7 +462,7 @@
         "x-accepts" : "application/json"
       },
       "get" : {
-        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         "operationId" : "getOrderById",
         "parameters" : [ {
           "description" : "ID of pet that needs to be fetched",
diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/public/openapi.json b/samples/server/petstore/java-play-framework-no-wrap-calls/public/openapi.json
index e5d8a0e3b07f..8b12859e6477 100644
--- a/samples/server/petstore/java-play-framework-no-wrap-calls/public/openapi.json
+++ b/samples/server/petstore/java-play-framework-no-wrap-calls/public/openapi.json
@@ -462,7 +462,7 @@
         "x-accepts" : "application/json"
       },
       "get" : {
-        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         "operationId" : "getOrderById",
         "parameters" : [ {
           "description" : "ID of pet that needs to be fetched",
diff --git a/samples/server/petstore/java-play-framework/public/openapi.json b/samples/server/petstore/java-play-framework/public/openapi.json
index e5d8a0e3b07f..8b12859e6477 100644
--- a/samples/server/petstore/java-play-framework/public/openapi.json
+++ b/samples/server/petstore/java-play-framework/public/openapi.json
@@ -462,7 +462,7 @@
         "x-accepts" : "application/json"
       },
       "get" : {
-        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         "operationId" : "getOrderById",
         "parameters" : [ {
           "description" : "ID of pet that needs to be fetched",
diff --git a/samples/server/petstore/java-undertow/src/main/java/org/openapitools/handler/PathHandlerInterface.java b/samples/server/petstore/java-undertow/src/main/java/org/openapitools/handler/PathHandlerInterface.java
index a9083dc97bf2..84384bbef80f 100644
--- a/samples/server/petstore/java-undertow/src/main/java/org/openapitools/handler/PathHandlerInterface.java
+++ b/samples/server/petstore/java-undertow/src/main/java/org/openapitools/handler/PathHandlerInterface.java
@@ -342,7 +342,7 @@ public interface PathHandlerInterface {
     /**
      * 
Find purchase order by ID

      *
-     * 
For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions

+     * 
For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions

      *
      * 
Endpoint: {@link Methods#GET GET} "/v2/store/order/{orderId}" (privileged: false)

      *
diff --git a/samples/server/petstore/java-undertow/src/main/resources/config/openapi.json b/samples/server/petstore/java-undertow/src/main/resources/config/openapi.json
index e5d8a0e3b07f..8b12859e6477 100644
--- a/samples/server/petstore/java-undertow/src/main/resources/config/openapi.json
+++ b/samples/server/petstore/java-undertow/src/main/resources/config/openapi.json
@@ -462,7 +462,7 @@
         "x-accepts" : "application/json"
       },
       "get" : {
-        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         "operationId" : "getOrderById",
         "parameters" : [ {
           "description" : "ID of pet that needs to be fetched",
diff --git a/samples/server/petstore/java-vertx-web/src/main/resources/openapi.yaml b/samples/server/petstore/java-vertx-web/src/main/resources/openapi.yaml
index 206abd76cbf8..3020b80831ad 100644
--- a/samples/server/petstore/java-vertx-web/src/main/resources/openapi.yaml
+++ b/samples/server/petstore/java-vertx-web/src/main/resources/openapi.yaml
@@ -364,7 +364,7 @@ paths:
       x-accepts: application/json
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/StoreApi.java
index 07e1505d06d7..820d6ef7672e 100644
--- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/StoreApi.java
@@ -61,7 +61,7 @@ public interface StoreApi  {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      */
     @GET
diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
index 3944d1fd04ab..c83c4ff69172 100644
--- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
@@ -51,7 +51,7 @@ public Map getInventory() {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      */
     public Order getOrderById(Long orderId) {
diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/test/java/org/openapitools/api/StoreApiTest.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/test/java/org/openapitools/api/StoreApiTest.java
index 54eb5757b93e..58d1014fcdda 100644
--- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/test/java/org/openapitools/api/StoreApiTest.java
+++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/test/java/org/openapitools/api/StoreApiTest.java
@@ -110,7 +110,7 @@ public void getInventoryTest() {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @throws ApiException
      *          if the Api call fails
diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApi.java
index db73aad9f66a..40870e41c75d 100644
--- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApi.java
@@ -66,7 +66,7 @@ public Response getInventory() {
     @Path("/order/{orderId}")
     
     @Produces({ "application/xml", "application/json" })
-    @ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class, tags={ "store" })
+    @ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions", response = Order.class, tags={ "store" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/StoreApi.java
index 8cf7a8471557..96b4b99c441d 100644
--- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/StoreApi.java
@@ -61,7 +61,7 @@ public interface StoreApi  {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      */
     @GET
diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
index 3944d1fd04ab..c83c4ff69172 100644
--- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
@@ -51,7 +51,7 @@ public Map getInventory() {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      */
     public Order getOrderById(Long orderId) {
diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/test/java/org/openapitools/api/StoreApiTest.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/test/java/org/openapitools/api/StoreApiTest.java
index 54eb5757b93e..58d1014fcdda 100644
--- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/test/java/org/openapitools/api/StoreApiTest.java
+++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/test/java/org/openapitools/api/StoreApiTest.java
@@ -110,7 +110,7 @@ public void getInventoryTest() {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @throws ApiException
      *          if the Api call fails
diff --git a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/api/FakeApi.java
index fc4cb1ebee55..6b159ebc17f6 100644
--- a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/api/FakeApi.java
@@ -161,7 +161,7 @@ public interface FakeApi  {
     
     @ApiOperation(value = "Fake endpoint to test group parameters (optional)", tags={ "fake" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 400, message = "Someting wrong") })
+        @ApiResponse(code = 400, message = "Something wrong") })
     public void testGroupParameters(@QueryParam("required_string_group") @NotNull Integer requiredStringGroup, @HeaderParam("required_boolean_group")  @NotNull Boolean requiredBooleanGroup, @QueryParam("required_int64_group") @NotNull Long requiredInt64Group, @QueryParam("string_group") Integer stringGroup, @HeaderParam("boolean_group")  Boolean booleanGroup, @QueryParam("int64_group") Long int64Group);
 
     /**
diff --git a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/api/StoreApi.java
index cb4bbe78aad3..b1d2de63d049 100644
--- a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/api/StoreApi.java
@@ -62,7 +62,7 @@ public interface StoreApi  {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      */
     @GET
diff --git a/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
index ee016a4fd33b..06d50eaabdd1 100644
--- a/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
@@ -72,7 +72,7 @@ public Map getInventory() {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      */
     @Override
diff --git a/samples/server/petstore/jaxrs-cxf-test-data/src/test/java/org/openapitools/api/StoreApiTest.java b/samples/server/petstore/jaxrs-cxf-test-data/src/test/java/org/openapitools/api/StoreApiTest.java
index b56220e980ea..5d869e6ffdd0 100644
--- a/samples/server/petstore/jaxrs-cxf-test-data/src/test/java/org/openapitools/api/StoreApiTest.java
+++ b/samples/server/petstore/jaxrs-cxf-test-data/src/test/java/org/openapitools/api/StoreApiTest.java
@@ -146,7 +146,7 @@ public void getInventoryTest() throws Exception {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @throws ApiException if the API call fails
      */
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/FakeApi.java
index b21fadcb1b2e..fc6c48b50d6c 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/FakeApi.java
@@ -158,7 +158,7 @@ public interface FakeApi  {
     
     @ApiOperation(value = "Fake endpoint to test group parameters (optional)", tags={ "fake" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 400, message = "Someting wrong") })
+        @ApiResponse(code = 400, message = "Something wrong") })
     public void testGroupParameters(@QueryParam("required_string_group") @NotNull Integer requiredStringGroup, @HeaderParam("required_boolean_group")  @NotNull Boolean requiredBooleanGroup, @QueryParam("required_int64_group") @NotNull Long requiredInt64Group, @QueryParam("string_group") Integer stringGroup, @HeaderParam("boolean_group")  Boolean booleanGroup, @QueryParam("int64_group") Long int64Group);
 
     /**
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/StoreApi.java
index 6b23b7c95a97..9cfd254736aa 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/StoreApi.java
@@ -61,7 +61,7 @@ public interface StoreApi  {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      */
     @GET
diff --git a/samples/server/petstore/jaxrs-cxf/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
index 668e92ac0ac9..b55199d58d28 100644
--- a/samples/server/petstore/jaxrs-cxf/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-cxf/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
@@ -51,7 +51,7 @@ public Map getInventory() {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      */
     public Order getOrderById(Long orderId) {
diff --git a/samples/server/petstore/jaxrs-cxf/src/test/java/org/openapitools/api/StoreApiTest.java b/samples/server/petstore/jaxrs-cxf/src/test/java/org/openapitools/api/StoreApiTest.java
index 7f1910cf795a..53eee27fddf3 100644
--- a/samples/server/petstore/jaxrs-cxf/src/test/java/org/openapitools/api/StoreApiTest.java
+++ b/samples/server/petstore/jaxrs-cxf/src/test/java/org/openapitools/api/StoreApiTest.java
@@ -98,7 +98,7 @@ public void getInventoryTest() {
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @throws ApiException
      *          if the Api call fails
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java
index 3f87596c76f8..899dfde8ef38 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java
@@ -195,7 +195,7 @@ public Response testEnumParameters(@ApiParam(value = "Header parameter enum test
     
     @io.swagger.annotations.ApiOperation(value = "Fake endpoint to test group parameters (optional)", notes = "Fake endpoint to test group parameters (optional)", response = Void.class, tags={ "fake", })
     @io.swagger.annotations.ApiResponses(value = {
-        @io.swagger.annotations.ApiResponse(code = 400, message = "Someting wrong", response = Void.class)
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Something wrong", response = Void.class)
     })
     public Response testGroupParameters(@ApiParam(value = "Required String in group parameters", required = true) @QueryParam("required_string_group") @NotNull  Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true)@HeaderParam("required_boolean_group") Boolean requiredBooleanGroup,@ApiParam(value = "Required Integer in group parameters", required = true) @QueryParam("required_int64_group") @NotNull  Long requiredInt64Group,@ApiParam(value = "String in group parameters") @QueryParam("string_group")  Integer stringGroup,@ApiParam(value = "Boolean in group parameters" )@HeaderParam("boolean_group") Boolean booleanGroup,@ApiParam(value = "Integer in group parameters") @QueryParam("int64_group")  Long int64Group,@Context SecurityContext securityContext)
     throws NotFoundException {
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java
index 92d0a9cda85f..9e52fe58f520 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java
@@ -86,7 +86,7 @@ public Response getInventory(@Context SecurityContext securityContext)
     @Path("/order/{order_id}")
     
     @Produces({ "application/xml", "application/json" })
-    @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class, tags={ "store", })
+    @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions", response = Order.class, tags={ "store", })
     @io.swagger.annotations.ApiResponses(value = {
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java
index 8bc0907117a1..1d5924839331 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java
@@ -237,7 +237,7 @@ public Response testEnumParameters(@ApiParam(value = "Header parameter enum test
         @io.swagger.annotations.Authorization(value = "bearer_test")
     }, tags={ "fake", })
     @io.swagger.annotations.ApiResponses(value = {
-        @io.swagger.annotations.ApiResponse(code = 400, message = "Someting wrong", response = Void.class)
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Something wrong", response = Void.class)
     })
     public Response testGroupParameters(@ApiParam(value = "Required String in group parameters", required = true) @QueryParam("required_string_group") @NotNull  Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true)@HeaderParam("required_boolean_group") Boolean requiredBooleanGroup,@ApiParam(value = "Required Integer in group parameters", required = true) @QueryParam("required_int64_group") @NotNull  Long requiredInt64Group,@ApiParam(value = "String in group parameters") @QueryParam("string_group")  Integer stringGroup,@ApiParam(value = "Boolean in group parameters" )@HeaderParam("boolean_group") Boolean booleanGroup,@ApiParam(value = "Integer in group parameters") @QueryParam("int64_group")  Long int64Group,@Context SecurityContext securityContext)
     throws NotFoundException {
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java
index 6f9333a9b055..aaaa25f41054 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java
@@ -86,7 +86,7 @@ public Response getInventory(@Context SecurityContext securityContext)
     @Path("/order/{order_id}")
     
     @Produces({ "application/xml", "application/json" })
-    @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class, tags={ "store", })
+    @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions", response = Order.class, tags={ "store", })
     @io.swagger.annotations.ApiResponses(value = {
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApi.java
index a79712327381..3439a9fab14a 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApi.java
@@ -63,7 +63,7 @@ public Response getInventory(@Context SecurityContext securityContext)
     @Path("/order/{orderId}")
     
     @Produces({ "application/xml", "application/json" })
-    @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class, tags={ "store", })
+    @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions", response = Order.class, tags={ "store", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class),
         
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/StoreApi.java
index 11213b47e314..74a885d26328 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/StoreApi.java
@@ -51,7 +51,7 @@ public interface StoreApi  {
     @Path("/order/{orderId}")
     
     @Produces({ "application/xml", "application/json" })
-    @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class, tags={ "store", })
+    @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions", response = Order.class, tags={ "store", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class),
         
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/StoreApi.java
index 11213b47e314..74a885d26328 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/StoreApi.java
@@ -51,7 +51,7 @@ public interface StoreApi  {
     @Path("/order/{orderId}")
     
     @Produces({ "application/xml", "application/json" })
-    @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class, tags={ "store", })
+    @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions", response = Order.class, tags={ "store", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class),
         
diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/StoreApi.java
index 11213b47e314..74a885d26328 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/StoreApi.java
@@ -51,7 +51,7 @@ public interface StoreApi  {
     @Path("/order/{orderId}")
     
     @Produces({ "application/xml", "application/json" })
-    @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class, tags={ "store", })
+    @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions", response = Order.class, tags={ "store", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class),
         
diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/StoreApi.java
index a79712327381..3439a9fab14a 100644
--- a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/StoreApi.java
@@ -63,7 +63,7 @@ public Response getInventory(@Context SecurityContext securityContext)
     @Path("/order/{orderId}")
     
     @Produces({ "application/xml", "application/json" })
-    @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class, tags={ "store", })
+    @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions", response = Order.class, tags={ "store", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class),
         
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApi.java
index a79712327381..3439a9fab14a 100644
--- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApi.java
@@ -63,7 +63,7 @@ public Response getInventory(@Context SecurityContext securityContext)
     @Path("/order/{orderId}")
     
     @Produces({ "application/xml", "application/json" })
-    @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class, tags={ "store", })
+    @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions", response = Order.class, tags={ "store", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class),
         
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/README.md b/samples/server/petstore/jaxrs-spec-interface-response/README.md
index 553be1f4b167..0fccd2bb1897 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/README.md
+++ b/samples/server/petstore/jaxrs-spec-interface-response/README.md
@@ -8,5 +8,5 @@ This is an example of building a OpenAPI-enabled JAX-RS server.
 This example uses the [JAX-RS](https://jax-rs-spec.java.net/) framework.
 
 This project produces a jar that defines some interfaces.
-The jar can be used in combination with an other project providing the implementation.
+The jar can be used in combination with another project providing the implementation.
 
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeApi.java
index ca6bdded416e..23a56fbb3702 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeApi.java
@@ -114,7 +114,7 @@ public interface FakeApi {
     @DELETE
     @ApiOperation(value = "Fake endpoint to test group parameters (optional)", notes = "Fake endpoint to test group parameters (optional)", tags={ "fake" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 400, message = "Someting wrong", response = Void.class) })
+        @ApiResponse(code = 400, message = "Something wrong", response = Void.class) })
     Response testGroupParameters(@QueryParam("required_string_group") @NotNull  @ApiParam("Required String in group parameters")  Integer requiredStringGroup,@HeaderParam("required_boolean_group") @NotNull   @ApiParam("Required Boolean in group parameters") Boolean requiredBooleanGroup,@QueryParam("required_int64_group") @NotNull  @ApiParam("Required Integer in group parameters")  Long requiredInt64Group,@QueryParam("string_group")  @ApiParam("String in group parameters")  Integer stringGroup,@HeaderParam("boolean_group")   @ApiParam("Boolean in group parameters") Boolean booleanGroup,@QueryParam("int64_group")  @ApiParam("Integer in group parameters")  Long int64Group);
 
     @POST
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/StoreApi.java
index 98797af84d08..b2a8f9c8ee14 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/StoreApi.java
@@ -41,7 +41,7 @@ public interface StoreApi {
     @GET
     @Path("/order/{order_id}")
     @Produces({ "application/xml", "application/json" })
-    @ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", tags={ "store" })
+    @ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions", tags={ "store" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/main/openapi/openapi.yaml b/samples/server/petstore/jaxrs-spec-interface-response/src/main/openapi/openapi.yaml
index bf1a42764177..d96b78131c87 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/main/openapi/openapi.yaml
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/main/openapi/openapi.yaml
@@ -392,7 +392,7 @@ paths:
       - tag: store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -714,7 +714,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/server/petstore/jaxrs-spec-interface/README.md b/samples/server/petstore/jaxrs-spec-interface/README.md
index 553be1f4b167..0fccd2bb1897 100644
--- a/samples/server/petstore/jaxrs-spec-interface/README.md
+++ b/samples/server/petstore/jaxrs-spec-interface/README.md
@@ -8,5 +8,5 @@ This is an example of building a OpenAPI-enabled JAX-RS server.
 This example uses the [JAX-RS](https://jax-rs-spec.java.net/) framework.
 
 This project produces a jar that defines some interfaces.
-The jar can be used in combination with an other project providing the implementation.
+The jar can be used in combination with another project providing the implementation.
 
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/FakeApi.java
index 8268f49481d7..77b99b940cad 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/FakeApi.java
@@ -117,7 +117,7 @@ public interface FakeApi {
     @DELETE
     @ApiOperation(value = "Fake endpoint to test group parameters (optional)", notes = "Fake endpoint to test group parameters (optional)", tags={ "fake" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 400, message = "Someting wrong", response = Void.class) })
+        @ApiResponse(code = 400, message = "Something wrong", response = Void.class) })
     void testGroupParameters(@QueryParam("required_string_group") @NotNull  @ApiParam("Required String in group parameters")  Integer requiredStringGroup,@HeaderParam("required_boolean_group") @NotNull   @ApiParam("Required Boolean in group parameters") Boolean requiredBooleanGroup,@QueryParam("required_int64_group") @NotNull  @ApiParam("Required Integer in group parameters")  Long requiredInt64Group,@QueryParam("string_group")  @ApiParam("String in group parameters")  Integer stringGroup,@HeaderParam("boolean_group")   @ApiParam("Boolean in group parameters") Boolean booleanGroup,@QueryParam("int64_group")  @ApiParam("Integer in group parameters")  Long int64Group);
 
     @POST
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/StoreApi.java
index 5d2ed08217fa..aac533751881 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/StoreApi.java
@@ -41,7 +41,7 @@ public interface StoreApi {
     @GET
     @Path("/order/{order_id}")
     @Produces({ "application/xml", "application/json" })
-    @ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", tags={ "store" })
+    @ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions", tags={ "store" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/main/openapi/openapi.yaml b/samples/server/petstore/jaxrs-spec-interface/src/main/openapi/openapi.yaml
index 2999e6f2f8d6..658d8a96b30b 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/main/openapi/openapi.yaml
+++ b/samples/server/petstore/jaxrs-spec-interface/src/main/openapi/openapi.yaml
@@ -392,7 +392,7 @@ paths:
       - tag: store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -714,7 +714,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/server/petstore/jaxrs-spec/README.md b/samples/server/petstore/jaxrs-spec/README.md
index 603301eaf35c..da90cb71c166 100644
--- a/samples/server/petstore/jaxrs-spec/README.md
+++ b/samples/server/petstore/jaxrs-spec/README.md
@@ -10,7 +10,7 @@ This example uses the [JAX-RS](https://jax-rs-spec.java.net/) framework.
 
 The JAX-RS implementation needs to be provided by the application server you are deploying on.
 
-To run the server from the command line, you can use maven to provision an start a TomEE Server.
+To run the server from the command line, you can use maven to provision and start a TomEE Server.
 Please execute the following:
 
 ```
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java
index da38dd54077d..43f4d635a078 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java
@@ -147,7 +147,7 @@ public Response testEnumParameters(@HeaderParam("enum_header_string_array")   @A
     @DELETE
     @ApiOperation(value = "Fake endpoint to test group parameters (optional)", notes = "Fake endpoint to test group parameters (optional)", response = Void.class, tags={ "fake" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 400, message = "Someting wrong", response = Void.class)
+        @ApiResponse(code = 400, message = "Something wrong", response = Void.class)
     })
     public Response testGroupParameters(@QueryParam("required_string_group") @NotNull  @ApiParam("Required String in group parameters")  Integer requiredStringGroup,@HeaderParam("required_boolean_group") @NotNull   @ApiParam("Required Boolean in group parameters") Boolean requiredBooleanGroup,@QueryParam("required_int64_group") @NotNull  @ApiParam("Required Integer in group parameters")  Long requiredInt64Group,@QueryParam("string_group")  @ApiParam("String in group parameters")  Integer stringGroup,@HeaderParam("boolean_group")   @ApiParam("Boolean in group parameters") Boolean booleanGroup,@QueryParam("int64_group")  @ApiParam("Integer in group parameters")  Long int64Group) {
         return Response.ok().entity("magic!").build();
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/StoreApi.java
index ada18d6e78ed..470a9fc2bbbf 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/StoreApi.java
@@ -47,7 +47,7 @@ public Response getInventory() {
     @GET
     @Path("/order/{order_id}")
     @Produces({ "application/xml", "application/json" })
-    @ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class, tags={ "store" })
+    @ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions", response = Order.class, tags={ "store" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
diff --git a/samples/server/petstore/jaxrs-spec/src/main/openapi/openapi.yaml b/samples/server/petstore/jaxrs-spec/src/main/openapi/openapi.yaml
index 2999e6f2f8d6..658d8a96b30b 100644
--- a/samples/server/petstore/jaxrs-spec/src/main/openapi/openapi.yaml
+++ b/samples/server/petstore/jaxrs-spec/src/main/openapi/openapi.yaml
@@ -392,7 +392,7 @@ paths:
       - tag: store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -714,7 +714,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApi.java
index 6c784c0d2b8c..57d6f247a462 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApi.java
@@ -202,7 +202,7 @@ public Response testEnumParameters(
     
     @io.swagger.annotations.ApiOperation(value = "Fake endpoint to test group parameters (optional)", notes = "Fake endpoint to test group parameters (optional)", response = Void.class, tags={ "fake" })
     @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 400, message = "Someting wrong", response = Void.class) })
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Something wrong", response = Void.class) })
     public Response testGroupParameters(
         @ApiParam(value = "Required String in group parameters", required = true) @QueryParam("required_string_group") @NotNull  Integer requiredStringGroup,
         @ApiParam(value = "Required Boolean in group parameters" ,required=true)@HeaderParam("required_boolean_group") Boolean requiredBooleanGroup,
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApi.java
index 90fdaa534229..7350bcfcaad5 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApi.java
@@ -66,7 +66,7 @@ public Response getInventory(
     @Path("/order/{order_id}")
     
     @Produces({ "application/xml", "application/json" })
-    @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class, tags={ "store" })
+    @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions", response = Order.class, tags={ "store" })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApi.java
index 6cd432d975ee..698d61867b10 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApi.java
@@ -203,7 +203,7 @@ public Response testEnumParameters(
     
     @io.swagger.annotations.ApiOperation(value = "Fake endpoint to test group parameters (optional)", notes = "Fake endpoint to test group parameters (optional)", response = Void.class, tags={ "fake" })
     @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 400, message = "Someting wrong", response = Void.class) })
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Something wrong", response = Void.class) })
     public Response testGroupParameters(
         @ApiParam(value = "Required String in group parameters", required = true) @QueryParam("required_string_group") @NotNull  Integer requiredStringGroup,
         @ApiParam(value = "Required Boolean in group parameters" ,required=true)@HeaderParam("required_boolean_group") Boolean requiredBooleanGroup,
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApi.java
index 601e971958c9..b0692bfa87c2 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApi.java
@@ -66,7 +66,7 @@ public Response getInventory(
     @Path("/order/{order_id}")
     
     @Produces({ "application/xml", "application/json" })
-    @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class, tags={ "store" })
+    @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions", response = Order.class, tags={ "store" })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApi.java
index f76bb76e05d6..b37b7cad26e7 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApi.java
@@ -193,7 +193,7 @@ public Response testEnumParameters(@ApiParam(value = "Header parameter enum test
     
     @io.swagger.annotations.ApiOperation(value = "Fake endpoint to test group parameters (optional)", notes = "Fake endpoint to test group parameters (optional)", response = Void.class, tags={ "fake", })
     @io.swagger.annotations.ApiResponses(value = {
-        @io.swagger.annotations.ApiResponse(code = 400, message = "Someting wrong", response = Void.class)
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Something wrong", response = Void.class)
     })
     public Response testGroupParameters(@ApiParam(value = "Required String in group parameters", required = true) @QueryParam("required_string_group") @NotNull  Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true)@HeaderParam("required_boolean_group") Boolean requiredBooleanGroup,@ApiParam(value = "Required Integer in group parameters", required = true) @QueryParam("required_int64_group") @NotNull  Long requiredInt64Group,@ApiParam(value = "String in group parameters") @QueryParam("string_group")  Integer stringGroup,@ApiParam(value = "Boolean in group parameters" )@HeaderParam("boolean_group") Boolean booleanGroup,@ApiParam(value = "Integer in group parameters") @QueryParam("int64_group")  Long int64Group,@Context SecurityContext securityContext)
     throws NotFoundException {
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApi.java
index c2080453606d..4e45841df443 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApi.java
@@ -86,7 +86,7 @@ public Response getInventory(@Context SecurityContext securityContext)
     @Path("/order/{order_id}")
     
     @Produces({ "application/xml", "application/json" })
-    @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class, tags={ "store", })
+    @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions", response = Order.class, tags={ "store", })
     @io.swagger.annotations.ApiResponses(value = {
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java
index 59ee63b18839..ad937f064f9e 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java
@@ -194,7 +194,7 @@ public Response testEnumParameters(@ApiParam(value = "Header parameter enum test
     
     @io.swagger.annotations.ApiOperation(value = "Fake endpoint to test group parameters (optional)", notes = "Fake endpoint to test group parameters (optional)", response = Void.class, tags={ "fake", })
     @io.swagger.annotations.ApiResponses(value = {
-        @io.swagger.annotations.ApiResponse(code = 400, message = "Someting wrong", response = Void.class)
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Something wrong", response = Void.class)
     })
     public Response testGroupParameters(@ApiParam(value = "Required String in group parameters", required = true) @QueryParam("required_string_group") @NotNull  Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true)@HeaderParam("required_boolean_group") Boolean requiredBooleanGroup,@ApiParam(value = "Required Integer in group parameters", required = true) @QueryParam("required_int64_group") @NotNull  Long requiredInt64Group,@ApiParam(value = "String in group parameters") @QueryParam("string_group")  Integer stringGroup,@ApiParam(value = "Boolean in group parameters" )@HeaderParam("boolean_group") Boolean booleanGroup,@ApiParam(value = "Integer in group parameters") @QueryParam("int64_group")  Long int64Group,@Context SecurityContext securityContext)
     throws NotFoundException {
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApi.java
index 92d0a9cda85f..9e52fe58f520 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApi.java
@@ -86,7 +86,7 @@ public Response getInventory(@Context SecurityContext securityContext)
     @Path("/order/{order_id}")
     
     @Produces({ "application/xml", "application/json" })
-    @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class, tags={ "store", })
+    @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions", response = Order.class, tags={ "store", })
     @io.swagger.annotations.ApiResponses(value = {
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
diff --git a/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/Paths.kt b/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/Paths.kt
index 3c3d343ceb75..71bc64b1cc28 100644
--- a/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/Paths.kt
+++ b/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/Paths.kt
@@ -92,7 +92,7 @@ object Paths {
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched 
      */
     @Location("/store/order/{orderId}") class getOrderById(val orderId: kotlin.Long)
diff --git a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/Paths.kt b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/Paths.kt
index dfde64ce918e..4920198e0f97 100644
--- a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/Paths.kt
+++ b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/Paths.kt
@@ -92,7 +92,7 @@ object Paths {
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param orderId ID of pet that needs to be fetched 
      */
     @Location("/store/order/{orderId}") class getOrderById(val orderId: kotlin.Long)
diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt
index 20ed842ab93e..2db3541159e1 100644
--- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt
+++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt
@@ -77,7 +77,7 @@ interface StoreApi {
     @Operation(
         summary = "Find purchase order by ID",
         operationId = "getOrderById",
-        description = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        description = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         responses = [
             ApiResponse(responseCode = "200", description = "successful operation", content = [Content(schema = Schema(implementation = Order::class))]),
             ApiResponse(responseCode = "400", description = "Invalid ID supplied"),
diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/resources/openapi.yaml b/samples/server/petstore/kotlin-springboot-delegate/src/main/resources/openapi.yaml
index f96f3d8027a0..6c5ca4308aaa 100644
--- a/samples/server/petstore/kotlin-springboot-delegate/src/main/resources/openapi.yaml
+++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/resources/openapi.yaml
@@ -348,7 +348,7 @@ paths:
       - store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/StoreApiController.kt
index 4106e3ed94fc..47ab1dbbeaf9 100644
--- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/StoreApiController.kt
+++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/StoreApiController.kt
@@ -69,7 +69,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic
     @Operation(
         summary = "Find purchase order by ID",
         operationId = "getOrderById",
-        description = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        description = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         responses = [
             ApiResponse(responseCode = "200", description = "successful operation", content = [Content(schema = Schema(implementation = Order::class))]),
             ApiResponse(responseCode = "400", description = "Invalid ID supplied"),
diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/StoreApiService.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/StoreApiService.kt
index 6de3e6cc1def..60e754529448 100644
--- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/StoreApiService.kt
+++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/StoreApiService.kt
@@ -26,7 +26,7 @@ interface StoreApiService {
 
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/resources/openapi.yaml b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/resources/openapi.yaml
index f3e1fb465fe6..1f68d6c2c11d 100644
--- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/resources/openapi.yaml
+++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/resources/openapi.yaml
@@ -341,7 +341,7 @@ paths:
       - store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiController.kt
index 9c90d7d38d98..73c731b6ea2d 100644
--- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiController.kt
+++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiController.kt
@@ -70,7 +70,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic
     @Operation(
         summary = "Find purchase order by ID",
         operationId = "getOrderById",
-        description = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        description = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         responses = [
             ApiResponse(responseCode = "200", description = "successful operation", content = [Content(schema = Schema(implementation = Order::class))]),
             ApiResponse(responseCode = "400", description = "Invalid ID supplied"),
diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiService.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiService.kt
index aa755f1fe68f..fd78633b807f 100644
--- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiService.kt
+++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiService.kt
@@ -27,7 +27,7 @@ interface StoreApiService {
 
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/resources/openapi.yaml b/samples/server/petstore/kotlin-springboot-reactive/src/main/resources/openapi.yaml
index f3e1fb465fe6..1f68d6c2c11d 100644
--- a/samples/server/petstore/kotlin-springboot-reactive/src/main/resources/openapi.yaml
+++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/resources/openapi.yaml
@@ -341,7 +341,7 @@ paths:
       - store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/StoreApiController.kt
index c3e90f46fd56..764c1073e564 100644
--- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/StoreApiController.kt
+++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/StoreApiController.kt
@@ -74,7 +74,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic
     @ApiOperation(
         value = "Find purchase order by ID",
         nickname = "getOrderById",
-        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         response = Order::class)
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation", response = Order::class),ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Order not found")])
diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/StoreApiService.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/StoreApiService.kt
index 6de3e6cc1def..60e754529448 100644
--- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/StoreApiService.kt
+++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/StoreApiService.kt
@@ -26,7 +26,7 @@ interface StoreApiService {
 
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/resources/openapi.yaml b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/resources/openapi.yaml
index f3e1fb465fe6..1f68d6c2c11d 100644
--- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/resources/openapi.yaml
+++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/resources/openapi.yaml
@@ -341,7 +341,7 @@ paths:
       - store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/StoreApiController.kt
index 4106e3ed94fc..47ab1dbbeaf9 100644
--- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/StoreApiController.kt
+++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/StoreApiController.kt
@@ -69,7 +69,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic
     @Operation(
         summary = "Find purchase order by ID",
         operationId = "getOrderById",
-        description = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        description = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         responses = [
             ApiResponse(responseCode = "200", description = "successful operation", content = [Content(schema = Schema(implementation = Order::class))]),
             ApiResponse(responseCode = "400", description = "Invalid ID supplied"),
diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/StoreApiService.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/StoreApiService.kt
index 6de3e6cc1def..60e754529448 100644
--- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/StoreApiService.kt
+++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/StoreApiService.kt
@@ -26,7 +26,7 @@ interface StoreApiService {
 
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/resources/openapi.yaml b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/resources/openapi.yaml
index f3e1fb465fe6..1f68d6c2c11d 100644
--- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/resources/openapi.yaml
+++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/resources/openapi.yaml
@@ -341,7 +341,7 @@ paths:
       - store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
diff --git a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/StoreApiController.kt
index c3e90f46fd56..764c1073e564 100644
--- a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/StoreApiController.kt
+++ b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/StoreApiController.kt
@@ -74,7 +74,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic
     @ApiOperation(
         value = "Find purchase order by ID",
         nickname = "getOrderById",
-        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         response = Order::class)
     @ApiResponses(
         value = [ApiResponse(code = 200, message = "successful operation", response = Order::class),ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Order not found")])
diff --git a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/StoreApiService.kt b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/StoreApiService.kt
index 6de3e6cc1def..60e754529448 100644
--- a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/StoreApiService.kt
+++ b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/StoreApiService.kt
@@ -26,7 +26,7 @@ interface StoreApiService {
 
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
diff --git a/samples/server/petstore/kotlin-springboot-springfox/src/main/resources/openapi.yaml b/samples/server/petstore/kotlin-springboot-springfox/src/main/resources/openapi.yaml
index f3e1fb465fe6..1f68d6c2c11d 100644
--- a/samples/server/petstore/kotlin-springboot-springfox/src/main/resources/openapi.yaml
+++ b/samples/server/petstore/kotlin-springboot-springfox/src/main/resources/openapi.yaml
@@ -341,7 +341,7 @@ paths:
       - store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApiService.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApiService.kt
index 6de3e6cc1def..60e754529448 100644
--- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApiService.kt
+++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApiService.kt
@@ -26,7 +26,7 @@ interface StoreApiService {
 
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
diff --git a/samples/server/petstore/nodejs-express-server/README.md b/samples/server/petstore/nodejs-express-server/README.md
index ffd6e8397a76..a083a1ae2f44 100644
--- a/samples/server/petstore/nodejs-express-server/README.md
+++ b/samples/server/petstore/nodejs-express-server/README.md
@@ -36,7 +36,7 @@ Unfortunately, I have not written any unit-tests. Those will come in the future.
 
 1. API documentation, and to check the available endpoints:
 http://localhost:3000/api-docs/. To
-2. Download the oepnapi.yaml document: http://localhost:3000/openapi.
+2. Download the openapi.yaml document: http://localhost:3000/openapi.
 3.  Every call to an endpoint that was defined in the openapi document will return a 200 and a list of all the parameters and objects that were sent in the request.
 4. Endpoints that require security need to have security handlers configured before they can return a successful response. At this point they will return [ a response code of 401](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/401).
 5. ##### At this stage the server does not support document body sent in xml format.
@@ -87,4 +87,4 @@ Future tests should be written to ensure that the response of every request sent
 
 
 #### models/
-Currently a concept awaiting feedback. The idea is to have the objects defined in the openapi.yaml act as models which are passed between the different modules. This will conform the programmers to interact using defined objects, rather than loosley-defined JSON objects. Given the nature of JavaScript progrmmers, who want to work with their own bootstrapped parameters, this concept might not work. Keeping this here for future discussion and feedback.
+Currently a concept awaiting feedback. The idea is to have the objects defined in the openapi.yaml act as models which are passed between the different modules. This will conform the programmers to interact using defined objects, rather than loosely-defined JSON objects. Given the nature of JavaScript programmers, who want to work with their own bootstrapped parameters, this concept might not work. Keeping this here for future discussion and feedback.
diff --git a/samples/server/petstore/nodejs-express-server/api/openapi.yaml b/samples/server/petstore/nodejs-express-server/api/openapi.yaml
index db29b0bab2b4..6fa9dd7eed5b 100644
--- a/samples/server/petstore/nodejs-express-server/api/openapi.yaml
+++ b/samples/server/petstore/nodejs-express-server/api/openapi.yaml
@@ -365,7 +365,7 @@ paths:
       x-eov-operation-handler: controllers/StoreController
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -492,7 +492,7 @@ paths:
                 format: int32
                 type: integer
             X-Expires-After:
-              description: date in UTC when toekn expires
+              description: date in UTC when token expires
               schema:
                 format: date-time
                 type: string
diff --git a/samples/server/petstore/nodejs-express-server/controllers/Controller.js b/samples/server/petstore/nodejs-express-server/controllers/Controller.js
index c791a8915876..a4115d014383 100644
--- a/samples/server/petstore/nodejs-express-server/controllers/Controller.js
+++ b/samples/server/petstore/nodejs-express-server/controllers/Controller.js
@@ -32,7 +32,7 @@ class Controller {
   /**
   * Files have been uploaded to the directory defined by config.js as upload directory
   * Files have a temporary name, that was saved as 'filename' of the file object that is
-  * referenced in reuquest.files array.
+  * referenced in request.files array.
   * This method finds the file and changes it to the file name that was originally called
   * when it was uploaded. To prevent files from being overwritten, a timestamp is added between
   * the filename and its extension
diff --git a/samples/server/petstore/nodejs-express-server/controllers/PetController.js b/samples/server/petstore/nodejs-express-server/controllers/PetController.js
index 9f6477cc26b6..e15b4d767346 100644
--- a/samples/server/petstore/nodejs-express-server/controllers/PetController.js
+++ b/samples/server/petstore/nodejs-express-server/controllers/PetController.js
@@ -1,6 +1,6 @@
 /**
  * The PetController file is a very simple one, which does not need to be changed manually,
- * unless there's a case where business logic reoutes the request to an entity which is not
+ * unless there's a case where business logic routes the request to an entity which is not
  * the service.
  * The heavy lifting of the Controller item is done in Request.js - that is where request
  * parameters are extracted and sent to the service, and where response is handled.
diff --git a/samples/server/petstore/nodejs-express-server/controllers/StoreController.js b/samples/server/petstore/nodejs-express-server/controllers/StoreController.js
index 90ea784f0e0b..18a330c1d5a8 100644
--- a/samples/server/petstore/nodejs-express-server/controllers/StoreController.js
+++ b/samples/server/petstore/nodejs-express-server/controllers/StoreController.js
@@ -1,6 +1,6 @@
 /**
  * The StoreController file is a very simple one, which does not need to be changed manually,
- * unless there's a case where business logic reoutes the request to an entity which is not
+ * unless there's a case where business logic routes the request to an entity which is not
  * the service.
  * The heavy lifting of the Controller item is done in Request.js - that is where request
  * parameters are extracted and sent to the service, and where response is handled.
diff --git a/samples/server/petstore/nodejs-express-server/controllers/UserController.js b/samples/server/petstore/nodejs-express-server/controllers/UserController.js
index 20f84fa76c26..59bafe4ef338 100644
--- a/samples/server/petstore/nodejs-express-server/controllers/UserController.js
+++ b/samples/server/petstore/nodejs-express-server/controllers/UserController.js
@@ -1,6 +1,6 @@
 /**
  * The UserController file is a very simple one, which does not need to be changed manually,
- * unless there's a case where business logic reoutes the request to an entity which is not
+ * unless there's a case where business logic routes the request to an entity which is not
  * the service.
  * The heavy lifting of the Controller item is done in Request.js - that is where request
  * parameters are extracted and sent to the service, and where response is handled.
diff --git a/samples/server/petstore/nodejs-express-server/services/StoreService.js b/samples/server/petstore/nodejs-express-server/services/StoreService.js
index 49157c317278..28b095edd21b 100644
--- a/samples/server/petstore/nodejs-express-server/services/StoreService.js
+++ b/samples/server/petstore/nodejs-express-server/services/StoreService.js
@@ -43,7 +43,7 @@ const getInventory = () => new Promise(
 );
 /**
 * Find purchase order by ID
-* For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+* For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 *
 * orderId Long ID of pet that needs to be fetched
 * returns Order
diff --git a/samples/server/petstore/nodejs-express-server/utils/openapiRouter.js b/samples/server/petstore/nodejs-express-server/utils/openapiRouter.js
index 1a77fec7b617..4c7bbdca7f3c 100644
--- a/samples/server/petstore/nodejs-express-server/utils/openapiRouter.js
+++ b/samples/server/petstore/nodejs-express-server/utils/openapiRouter.js
@@ -16,14 +16,14 @@ function handleError(err, request, response, next) {
 /**
  * The purpose of this route is to collect the request variables as defined in the
  * OpenAPI document and pass them to the handling controller as another Express
- * middleware. All parameters are collected in the requet.swagger.values key-value object
+ * middleware. All parameters are collected in the request.swagger.values key-value object
  *
  * The assumption is that security handlers have already verified and allowed access
- * to this path. If the business-logic of a particular path is dependant on authentication
+ * to this path. If the business-logic of a particular path is dependent on authentication
  * parameters (e.g. scope checking) - it is recommended to define the authentication header
  * as one of the parameters expected in the OpenAPI/Swagger document.
  *
- *  Requests made to paths that are not in the OpernAPI scope
+ *  Requests made to paths that are not in the OpenAPI scope
  *  are passed on to the next middleware handler.
  * @returns {Function}
  */
diff --git a/samples/server/petstore/php-laravel/lib/routes/api.php b/samples/server/petstore/php-laravel/lib/routes/api.php
index 2127861b2e71..ca0e27d2241d 100644
--- a/samples/server/petstore/php-laravel/lib/routes/api.php
+++ b/samples/server/petstore/php-laravel/lib/routes/api.php
@@ -248,7 +248,7 @@
 /**
  * get getOrderById
  * Summary: Find purchase order by ID
- * Notes: For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+ * Notes: For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
  * Output-Formats: [application/xml, application/json]
  */
 Route::get('/v2/store/order/{order_id}', 'StoreController@getOrderById');
diff --git a/samples/server/petstore/php-lumen/lib/routes/web.php b/samples/server/petstore/php-lumen/lib/routes/web.php
index 33eaaa40a6c1..8e987b516596 100644
--- a/samples/server/petstore/php-lumen/lib/routes/web.php
+++ b/samples/server/petstore/php-lumen/lib/routes/web.php
@@ -264,7 +264,7 @@
 /**
  * get getOrderById
  * Summary: Find purchase order by ID
- * Notes: For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+ * Notes: For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
  */
 $router->get('/v2/store/order/{order_id}', 'StoreApi@getOrderById');
 
diff --git a/samples/server/petstore/php-slim4/lib/Api/AbstractStoreApi.php b/samples/server/petstore/php-slim4/lib/Api/AbstractStoreApi.php
index 226f58c35a14..2bac5b6b2ba1 100644
--- a/samples/server/petstore/php-slim4/lib/Api/AbstractStoreApi.php
+++ b/samples/server/petstore/php-slim4/lib/Api/AbstractStoreApi.php
@@ -81,7 +81,7 @@ public function getInventory(
     /**
      * GET getOrderById
      * Summary: Find purchase order by ID
-     * Notes: For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * Notes: For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * Output-Formats: [application/xml, application/json]
      *
      * @param ServerRequestInterface $request  Request
diff --git a/samples/server/petstore/php-slim4/pom.xml b/samples/server/petstore/php-slim4/pom.xml
index cde894e95827..e5f532b7fad9 100644
--- a/samples/server/petstore/php-slim4/pom.xml
+++ b/samples/server/petstore/php-slim4/pom.xml
@@ -1,6 +1,6 @@
 
     4.0.0
-    org.opoenapitools
+    org.openapitools
     Slim4PetstoreServerTests
     pom
     1.0-SNAPSHOT
diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/docs/Api/StoreApiInterface.md b/samples/server/petstore/php-symfony/SymfonyBundle-php/docs/Api/StoreApiInterface.md
index c9aedf55e38d..b6ed0824d5c8 100644
--- a/samples/server/petstore/php-symfony/SymfonyBundle-php/docs/Api/StoreApiInterface.md
+++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/docs/Api/StoreApiInterface.md
@@ -139,7 +139,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example Implementation
 ```php
diff --git a/samples/server/petstore/python-aiohttp-srclayout/README.md b/samples/server/petstore/python-aiohttp-srclayout/README.md
index 6aa7491711b1..b68e70a6a96d 100644
--- a/samples/server/petstore/python-aiohttp-srclayout/README.md
+++ b/samples/server/petstore/python-aiohttp-srclayout/README.md
@@ -38,7 +38,7 @@ pytest
 
 ## Prevent file overriding
 
-After first generation, add edited files to _.openapi-generator-ignore_ to prevent generator to overwrite them. Typically:
+After first generation, add edited files to _.openapi-generator-ignore_ to prevent generator from overwriting them. Typically:
 ```
 server/controllers/*
 test/*
diff --git a/samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/controllers/store_controller.py b/samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/controllers/store_controller.py
index 80512d357f26..38792ced264b 100644
--- a/samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/controllers/store_controller.py
+++ b/samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/controllers/store_controller.py
@@ -30,7 +30,7 @@ async def get_inventory(request: web.Request, ) -> web.Response:
 async def get_order_by_id(request: web.Request, order_id) -> web.Response:
     """Find purchase order by ID
 
-    For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
     :param order_id: ID of pet that needs to be fetched
     :type order_id: int
diff --git a/samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/openapi/openapi.yaml b/samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/openapi/openapi.yaml
index b7d45bc5755f..7f83054c4a72 100644
--- a/samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/openapi/openapi.yaml
+++ b/samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/openapi/openapi.yaml
@@ -359,7 +359,7 @@ paths:
       x-openapi-router-controller: openapi_server.controllers.store_controller
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: get_order_by_id
       parameters:
       - description: ID of pet that needs to be fetched
diff --git a/samples/server/petstore/python-aiohttp-srclayout/tests/test_pet_controller.py b/samples/server/petstore/python-aiohttp-srclayout/tests/test_pet_controller.py
index 5f6384a34f67..3cac35cc24cb 100644
--- a/samples/server/petstore/python-aiohttp-srclayout/tests/test_pet_controller.py
+++ b/samples/server/petstore/python-aiohttp-srclayout/tests/test_pet_controller.py
@@ -9,7 +9,7 @@
 from openapi_server.models.pet import Pet
 
 
-@pytest.mark.skip("Connexion does not support multiple consummes. See https://github.com/zalando/connexion/pull/760")
+@pytest.mark.skip("Connexion does not support multiple consumes. See https://github.com/zalando/connexion/pull/760")
 async def test_add_pet(client):
     """Test case for add_pet
 
@@ -117,7 +117,7 @@ async def test_get_pet_by_id(client):
     assert response.status == 200, 'Response body is : ' + (await response.read()).decode('utf-8')
 
 
-@pytest.mark.skip("Connexion does not support multiple consummes. See https://github.com/zalando/connexion/pull/760")
+@pytest.mark.skip("Connexion does not support multiple consumes. See https://github.com/zalando/connexion/pull/760")
 async def test_update_pet(client):
     """Test case for update_pet
 
diff --git a/samples/server/petstore/python-aiohttp/README.md b/samples/server/petstore/python-aiohttp/README.md
index 6aa7491711b1..b68e70a6a96d 100644
--- a/samples/server/petstore/python-aiohttp/README.md
+++ b/samples/server/petstore/python-aiohttp/README.md
@@ -38,7 +38,7 @@ pytest
 
 ## Prevent file overriding
 
-After first generation, add edited files to _.openapi-generator-ignore_ to prevent generator to overwrite them. Typically:
+After first generation, add edited files to _.openapi-generator-ignore_ to prevent generator from overwriting them. Typically:
 ```
 server/controllers/*
 test/*
diff --git a/samples/server/petstore/python-aiohttp/openapi_server/controllers/store_controller.py b/samples/server/petstore/python-aiohttp/openapi_server/controllers/store_controller.py
index 80512d357f26..38792ced264b 100644
--- a/samples/server/petstore/python-aiohttp/openapi_server/controllers/store_controller.py
+++ b/samples/server/petstore/python-aiohttp/openapi_server/controllers/store_controller.py
@@ -30,7 +30,7 @@ async def get_inventory(request: web.Request, ) -> web.Response:
 async def get_order_by_id(request: web.Request, order_id) -> web.Response:
     """Find purchase order by ID
 
-    For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
     :param order_id: ID of pet that needs to be fetched
     :type order_id: int
diff --git a/samples/server/petstore/python-aiohttp/openapi_server/openapi/openapi.yaml b/samples/server/petstore/python-aiohttp/openapi_server/openapi/openapi.yaml
index b7d45bc5755f..7f83054c4a72 100644
--- a/samples/server/petstore/python-aiohttp/openapi_server/openapi/openapi.yaml
+++ b/samples/server/petstore/python-aiohttp/openapi_server/openapi/openapi.yaml
@@ -359,7 +359,7 @@ paths:
       x-openapi-router-controller: openapi_server.controllers.store_controller
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: get_order_by_id
       parameters:
       - description: ID of pet that needs to be fetched
diff --git a/samples/server/petstore/python-blueplanet/app/openapi_server/controllers/store_controller.py b/samples/server/petstore/python-blueplanet/app/openapi_server/controllers/store_controller.py
index 30e6bbd3a9a0..b6485ae10a86 100644
--- a/samples/server/petstore/python-blueplanet/app/openapi_server/controllers/store_controller.py
+++ b/samples/server/petstore/python-blueplanet/app/openapi_server/controllers/store_controller.py
@@ -32,7 +32,7 @@ def get_inventory():  # noqa: E501
 def get_order_by_id(order_id):  # noqa: E501
     """Find purchase order by ID
 
-    For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions # noqa: E501
+    For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions # noqa: E501
 
     :param order_id: ID of pet that needs to be fetched
     :type order_id: int
diff --git a/samples/server/petstore/python-fastapi/openapi.yaml b/samples/server/petstore/python-fastapi/openapi.yaml
index 49ab56baa7e0..d082ad070905 100644
--- a/samples/server/petstore/python-fastapi/openapi.yaml
+++ b/samples/server/petstore/python-fastapi/openapi.yaml
@@ -348,7 +348,7 @@ paths:
       - store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
diff --git a/samples/server/petstore/python-fastapi/src/openapi_server/apis/store_api.py b/samples/server/petstore/python-fastapi/src/openapi_server/apis/store_api.py
index b21e32f26f99..63315cfe5471 100644
--- a/samples/server/petstore/python-fastapi/src/openapi_server/apis/store_api.py
+++ b/samples/server/petstore/python-fastapi/src/openapi_server/apis/store_api.py
@@ -72,7 +72,7 @@ async def get_inventory(
 async def get_order_by_id(
     orderId: int = Path(None, description="ID of pet that needs to be fetched", ge=1, le=5),
 ) -> Order:
-    """For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions"""
+    """For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions"""
     ...
 
 
diff --git a/samples/server/petstore/python-flask/openapi_server/controllers/store_controller.py b/samples/server/petstore/python-flask/openapi_server/controllers/store_controller.py
index 218a6d811bcc..21bc29621fed 100644
--- a/samples/server/petstore/python-flask/openapi_server/controllers/store_controller.py
+++ b/samples/server/petstore/python-flask/openapi_server/controllers/store_controller.py
@@ -35,7 +35,7 @@ def get_inventory():  # noqa: E501
 def get_order_by_id(order_id):  # noqa: E501
     """Find purchase order by ID
 
-    For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions # noqa: E501
+    For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions # noqa: E501
 
     :param order_id: ID of pet that needs to be fetched
     :type order_id: int
diff --git a/samples/server/petstore/python-flask/openapi_server/openapi/openapi.yaml b/samples/server/petstore/python-flask/openapi_server/openapi/openapi.yaml
index ff528ad1f417..0d47b9c980b7 100644
--- a/samples/server/petstore/python-flask/openapi_server/openapi/openapi.yaml
+++ b/samples/server/petstore/python-flask/openapi_server/openapi/openapi.yaml
@@ -352,7 +352,7 @@ paths:
       x-openapi-router-controller: openapi_server.controllers.store_controller
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: get_order_by_id
       parameters:
       - description: ID of pet that needs to be fetched
diff --git a/samples/server/petstore/ruby-on-rails/pom.xml b/samples/server/petstore/ruby-on-rails/pom.xml
index 53cf1b97adc4..7d16212d00da 100644
--- a/samples/server/petstore/ruby-on-rails/pom.xml
+++ b/samples/server/petstore/ruby-on-rails/pom.xml
@@ -1,6 +1,6 @@
 
     4.0.0
-    org.opoenapitools
+    org.openapitools
     RORPetstoreServerTests
     pom
     1.0-SNAPSHOT
diff --git a/samples/server/petstore/ruby-sinatra/api/store_api.rb b/samples/server/petstore/ruby-sinatra/api/store_api.rb
index 7d1b54b2b79f..5605a2326626 100644
--- a/samples/server/petstore/ruby-sinatra/api/store_api.rb
+++ b/samples/server/petstore/ruby-sinatra/api/store_api.rb
@@ -45,7 +45,7 @@
   "nickname" => "get_order_by_id", 
   "responseClass" => "Order",
   "endpoint" => "/store/order/{orderId}", 
-  "notes" => "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+  "notes" => "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
   "parameters" => [
     {
       "name" => "order_id",
diff --git a/samples/server/petstore/ruby-sinatra/openapi.yaml b/samples/server/petstore/ruby-sinatra/openapi.yaml
index 26aaeac34b7d..612ca3c815f8 100644
--- a/samples/server/petstore/ruby-sinatra/openapi.yaml
+++ b/samples/server/petstore/ruby-sinatra/openapi.yaml
@@ -358,7 +358,7 @@ paths:
       - store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -482,7 +482,7 @@ paths:
                 type: integer
               style: simple
             X-Expires-After:
-              description: date in UTC when toekn expires
+              description: date in UTC when token expires
               explode: false
               schema:
                 format: date-time
diff --git a/samples/server/petstore/rust-server/output/no-example-v3/api/openapi.yaml b/samples/server/petstore/rust-server/output/no-example-v3/api/openapi.yaml
index a60a7da8f324..ff77d0c73295 100644
--- a/samples/server/petstore/rust-server/output/no-example-v3/api/openapi.yaml
+++ b/samples/server/petstore/rust-server/output/no-example-v3/api/openapi.yaml
@@ -20,7 +20,7 @@ components:
   schemas:
     _op_get_request:
       properties:
-        propery:
+        property:
           type: string
       required:
       - property
diff --git a/samples/server/petstore/rust-server/output/no-example-v3/docs/InlineObject.md b/samples/server/petstore/rust-server/output/no-example-v3/docs/InlineObject.md
index de17071caf85..75f57d2c007d 100644
--- a/samples/server/petstore/rust-server/output/no-example-v3/docs/InlineObject.md
+++ b/samples/server/petstore/rust-server/output/no-example-v3/docs/InlineObject.md
@@ -3,7 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**propery** | **String** |  | [optional] [default to None]
+**property** | **String** |  | [optional] [default to None]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/server/petstore/rust-server/output/no-example-v3/docs/InlineRequest.md b/samples/server/petstore/rust-server/output/no-example-v3/docs/InlineRequest.md
index 1b792f66d8de..73ca04d17667 100644
--- a/samples/server/petstore/rust-server/output/no-example-v3/docs/InlineRequest.md
+++ b/samples/server/petstore/rust-server/output/no-example-v3/docs/InlineRequest.md
@@ -3,7 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**propery** | **String** |  | [optional] [default to None]
+**property** | **String** |  | [optional] [default to None]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/server/petstore/rust-server/output/no-example-v3/docs/OpGetRequest.md b/samples/server/petstore/rust-server/output/no-example-v3/docs/OpGetRequest.md
index fc7bb0c542ce..70c884fc7b06 100644
--- a/samples/server/petstore/rust-server/output/no-example-v3/docs/OpGetRequest.md
+++ b/samples/server/petstore/rust-server/output/no-example-v3/docs/OpGetRequest.md
@@ -3,7 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**propery** | **String** |  | [optional] [default to None]
+**property** | **String** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/server/petstore/rust-server/output/no-example-v3/src/models.rs b/samples/server/petstore/rust-server/output/no-example-v3/src/models.rs
index cc90dcda97e5..dec1190139f4 100644
--- a/samples/server/petstore/rust-server/output/no-example-v3/src/models.rs
+++ b/samples/server/petstore/rust-server/output/no-example-v3/src/models.rs
@@ -7,17 +7,16 @@ use crate::header;
 #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)]
 #[cfg_attr(feature = "conversion", derive(frunk::LabelledGeneric))]
 pub struct OpGetRequest {
-    #[serde(rename = "propery")]
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub propery: Option,
+    #[serde(rename = "property")]
+    pub property: String,
 
 }
 
 impl OpGetRequest {
     #[allow(clippy::new_without_default)]
-    pub fn new() -> OpGetRequest {
+    pub fn new(property: String, ) -> OpGetRequest {
         OpGetRequest {
-            propery: None,
+            property,
         }
     }
 }
@@ -29,12 +28,8 @@ impl std::string::ToString for OpGetRequest {
     fn to_string(&self) -> String {
         let params: Vec> = vec![
 
-            self.propery.as_ref().map(|propery| {
-                vec![
-                    "propery".to_string(),
-                    propery.to_string(),
-                ].join(",")
-            }),
+            Some("property".to_string()),
+            Some(self.property.to_string()),
 
         ];
 
@@ -53,7 +48,7 @@ impl std::str::FromStr for OpGetRequest {
         #[derive(Default)]
         #[allow(dead_code)]
         struct IntermediateRep {
-            pub propery: Vec,
+            pub property: Vec,
         }
 
         let mut intermediate_rep = IntermediateRep::default();
@@ -72,7 +67,7 @@ impl std::str::FromStr for OpGetRequest {
                 #[allow(clippy::match_single_binding)]
                 match key {
                     #[allow(clippy::redundant_clone)]
-                    "propery" => intermediate_rep.propery.push(::from_str(val).map_err(|x| x.to_string())?),
+                    "property" => intermediate_rep.property.push(::from_str(val).map_err(|x| x.to_string())?),
                     _ => return std::result::Result::Err("Unexpected key while parsing OpGetRequest".to_string())
                 }
             }
@@ -83,7 +78,7 @@ impl std::str::FromStr for OpGetRequest {
 
         // Use the intermediate representation to return the struct
         std::result::Result::Ok(OpGetRequest {
-            propery: intermediate_rep.propery.into_iter().next(),
+            property: intermediate_rep.property.into_iter().next().ok_or_else(|| "property missing in OpGetRequest".to_string())?,
         })
     }
 }
diff --git a/samples/server/petstore/rust-server/output/openapi-v3/src/models.rs b/samples/server/petstore/rust-server/output/openapi-v3/src/models.rs
index 2f238bd1d9f6..7ecada6db3c9 100644
--- a/samples/server/petstore/rust-server/output/openapi-v3/src/models.rs
+++ b/samples/server/petstore/rust-server/output/openapi-v3/src/models.rs
@@ -639,7 +639,7 @@ impl AnyOfObject {
 }
 
 /// Enumeration of values.
-/// Since this enum's variants do not hold data, we can easily define them them as `#[repr(C)]`
+/// Since this enum's variants do not hold data, we can easily define them as `#[repr(C)]`
 /// which helps with FFI.
 #[allow(non_camel_case_types)]
 #[repr(C)]
@@ -975,7 +975,7 @@ impl DuplicateXmlObject {
 
 /// Test a model containing a special character in the enum
 /// Enumeration of values.
-/// Since this enum's variants do not hold data, we can easily define them them as `#[repr(C)]`
+/// Since this enum's variants do not hold data, we can easily define them as `#[repr(C)]`
 /// which helps with FFI.
 #[allow(non_camel_case_types)]
 #[repr(C)]
@@ -1243,7 +1243,7 @@ impl Model12345AnyOfObject {
 }
 
 /// Enumeration of values.
-/// Since this enum's variants do not hold data, we can easily define them them as `#[repr(C)]`
+/// Since this enum's variants do not hold data, we can easily define them as `#[repr(C)]`
 /// which helps with FFI.
 #[allow(non_camel_case_types)]
 #[repr(C)]
@@ -2670,7 +2670,7 @@ impl Result {
 }
 
 /// Enumeration of values.
-/// Since this enum's variants do not hold data, we can easily define them them as `#[repr(C)]`
+/// Since this enum's variants do not hold data, we can easily define them as `#[repr(C)]`
 /// which helps with FFI.
 #[allow(non_camel_case_types)]
 #[repr(C)]
diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml
index 14bc8aeebe5a..6acd275ac246 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml
@@ -342,7 +342,7 @@ paths:
       - store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/store_api.md b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/store_api.md
index 314d2533d61b..9c8c27bcc365 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/store_api.md
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/store_api.md
@@ -65,7 +65,7 @@ This endpoint does not need any parameter.
 > models::Order getOrderById(order_id)
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Required Parameters
 
diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/models.rs b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/models.rs
index faf92e4f9ace..44ead8dc18d3 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/models.rs
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/models.rs
@@ -2526,7 +2526,7 @@ impl EnumArrays {
 }
 
 /// Enumeration of values.
-/// Since this enum's variants do not hold data, we can easily define them them as `#[repr(C)]`
+/// Since this enum's variants do not hold data, we can easily define them as `#[repr(C)]`
 /// which helps with FFI.
 #[allow(non_camel_case_types)]
 #[repr(C)]
@@ -4706,7 +4706,7 @@ impl OuterComposite {
 }
 
 /// Enumeration of values.
-/// Since this enum's variants do not hold data, we can easily define them them as `#[repr(C)]`
+/// Since this enum's variants do not hold data, we can easily define them as `#[repr(C)]`
 /// which helps with FFI.
 #[allow(non_camel_case_types)]
 #[repr(C)]
diff --git a/samples/server/petstore/rust-server/output/rust-server-test/api/openapi.yaml b/samples/server/petstore/rust-server/output/rust-server-test/api/openapi.yaml
index 81e4b4dc2329..fcec6c8fa8b9 100644
--- a/samples/server/petstore/rust-server/output/rust-server-test/api/openapi.yaml
+++ b/samples/server/petstore/rust-server/output/rust-server-test/api/openapi.yaml
@@ -153,7 +153,7 @@ components:
           type: string
     baseAllOf:
       properties:
-        sampleBasePropery:
+        sampleBaseProperty:
           type: string
       type: object
     aNullableContainer:
diff --git a/samples/server/petstore/rust-server/output/rust-server-test/docs/AllOfObject.md b/samples/server/petstore/rust-server/output/rust-server-test/docs/AllOfObject.md
index 2c1484d14833..d9f96cbbc22e 100644
--- a/samples/server/petstore/rust-server/output/rust-server-test/docs/AllOfObject.md
+++ b/samples/server/petstore/rust-server/output/rust-server-test/docs/AllOfObject.md
@@ -4,7 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **sample_property** | **String** |  | [optional] [default to None]
-**sample_base_propery** | **String** |  | [optional] [default to None]
+**sample_base_property** | **String** |  | [optional] [default to None]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/server/petstore/rust-server/output/rust-server-test/docs/BaseAllOf.md b/samples/server/petstore/rust-server/output/rust-server-test/docs/BaseAllOf.md
index aa39ac24756c..9de71eae81f1 100644
--- a/samples/server/petstore/rust-server/output/rust-server-test/docs/BaseAllOf.md
+++ b/samples/server/petstore/rust-server/output/rust-server-test/docs/BaseAllOf.md
@@ -3,7 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**sample_base_propery** | **String** |  | [optional] [default to None]
+**sample_base_property** | **String** |  | [optional] [default to None]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/server/petstore/rust-server/output/rust-server-test/src/models.rs b/samples/server/petstore/rust-server/output/rust-server-test/src/models.rs
index a05942751b3c..2c227c2b9881 100644
--- a/samples/server/petstore/rust-server/output/rust-server-test/src/models.rs
+++ b/samples/server/petstore/rust-server/output/rust-server-test/src/models.rs
@@ -197,9 +197,9 @@ pub struct AllOfObject {
     #[serde(skip_serializing_if="Option::is_none")]
     pub sample_property: Option,
 
-    #[serde(rename = "sampleBasePropery")]
+    #[serde(rename = "sampleBaseProperty")]
     #[serde(skip_serializing_if="Option::is_none")]
-    pub sample_base_propery: Option,
+    pub sample_base_property: Option,
 
 }
 
@@ -208,7 +208,7 @@ impl AllOfObject {
     pub fn new() -> AllOfObject {
         AllOfObject {
             sample_property: None,
-            sample_base_propery: None,
+            sample_base_property: None,
         }
     }
 }
@@ -228,10 +228,10 @@ impl std::string::ToString for AllOfObject {
             }),
 
 
-            self.sample_base_propery.as_ref().map(|sample_base_propery| {
+            self.sample_base_property.as_ref().map(|sample_base_property| {
                 vec![
-                    "sampleBasePropery".to_string(),
-                    sample_base_propery.to_string(),
+                    "sampleBaseProperty".to_string(),
+                    sample_base_property.to_string(),
                 ].join(",")
             }),
 
@@ -253,7 +253,7 @@ impl std::str::FromStr for AllOfObject {
         #[allow(dead_code)]
         struct IntermediateRep {
             pub sample_property: Vec,
-            pub sample_base_propery: Vec,
+            pub sample_base_property: Vec,
         }
 
         let mut intermediate_rep = IntermediateRep::default();
@@ -274,7 +274,7 @@ impl std::str::FromStr for AllOfObject {
                     #[allow(clippy::redundant_clone)]
                     "sampleProperty" => intermediate_rep.sample_property.push(::from_str(val).map_err(|x| x.to_string())?),
                     #[allow(clippy::redundant_clone)]
-                    "sampleBasePropery" => intermediate_rep.sample_base_propery.push(::from_str(val).map_err(|x| x.to_string())?),
+                    "sampleBaseProperty" => intermediate_rep.sample_base_property.push(::from_str(val).map_err(|x| x.to_string())?),
                     _ => return std::result::Result::Err("Unexpected key while parsing AllOfObject".to_string())
                 }
             }
@@ -286,7 +286,7 @@ impl std::str::FromStr for AllOfObject {
         // Use the intermediate representation to return the struct
         std::result::Result::Ok(AllOfObject {
             sample_property: intermediate_rep.sample_property.into_iter().next(),
-            sample_base_propery: intermediate_rep.sample_base_propery.into_iter().next(),
+            sample_base_property: intermediate_rep.sample_base_property.into_iter().next(),
         })
     }
 }
@@ -333,9 +333,9 @@ impl std::convert::TryFrom for header::IntoHeaderVal
 #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)]
 #[cfg_attr(feature = "conversion", derive(frunk::LabelledGeneric))]
 pub struct BaseAllOf {
-    #[serde(rename = "sampleBasePropery")]
+    #[serde(rename = "sampleBaseProperty")]
     #[serde(skip_serializing_if="Option::is_none")]
-    pub sample_base_propery: Option,
+    pub sample_base_property: Option,
 
 }
 
@@ -343,7 +343,7 @@ impl BaseAllOf {
     #[allow(clippy::new_without_default)]
     pub fn new() -> BaseAllOf {
         BaseAllOf {
-            sample_base_propery: None,
+            sample_base_property: None,
         }
     }
 }
@@ -355,10 +355,10 @@ impl std::string::ToString for BaseAllOf {
     fn to_string(&self) -> String {
         let params: Vec> = vec![
 
-            self.sample_base_propery.as_ref().map(|sample_base_propery| {
+            self.sample_base_property.as_ref().map(|sample_base_property| {
                 vec![
-                    "sampleBasePropery".to_string(),
-                    sample_base_propery.to_string(),
+                    "sampleBaseProperty".to_string(),
+                    sample_base_property.to_string(),
                 ].join(",")
             }),
 
@@ -379,7 +379,7 @@ impl std::str::FromStr for BaseAllOf {
         #[derive(Default)]
         #[allow(dead_code)]
         struct IntermediateRep {
-            pub sample_base_propery: Vec,
+            pub sample_base_property: Vec,
         }
 
         let mut intermediate_rep = IntermediateRep::default();
@@ -398,7 +398,7 @@ impl std::str::FromStr for BaseAllOf {
                 #[allow(clippy::match_single_binding)]
                 match key {
                     #[allow(clippy::redundant_clone)]
-                    "sampleBasePropery" => intermediate_rep.sample_base_propery.push(::from_str(val).map_err(|x| x.to_string())?),
+                    "sampleBaseProperty" => intermediate_rep.sample_base_property.push(::from_str(val).map_err(|x| x.to_string())?),
                     _ => return std::result::Result::Err("Unexpected key while parsing BaseAllOf".to_string())
                 }
             }
@@ -409,7 +409,7 @@ impl std::str::FromStr for BaseAllOf {
 
         // Use the intermediate representation to return the struct
         std::result::Result::Ok(BaseAllOf {
-            sample_base_propery: intermediate_rep.sample_base_propery.into_iter().next(),
+            sample_base_property: intermediate_rep.sample_base_property.into_iter().next(),
         })
     }
 }
diff --git a/samples/server/petstore/scala-lagom-server/.openapi-generator-ignore b/samples/server/petstore/scala-lagom-server/.openapi-generator-ignore
index c5fa491b4c55..deed424f8a15 100644
--- a/samples/server/petstore/scala-lagom-server/.openapi-generator-ignore
+++ b/samples/server/petstore/scala-lagom-server/.openapi-generator-ignore
@@ -5,7 +5,7 @@
 # The patterns follow closely to .gitignore or .dockerignore.
 
 # As an example, the C# client generator defines ApiClient.cs.
-# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+# You can make changes and tell Swagger Codegen to ignore just this file by uncommenting the following line:
 #ApiClient.cs
 
 # You can match any string of characters against a directory, file or extension with a single asterisk (*):
diff --git a/samples/server/petstore/scala-lagom-server/src/main/scala/io/swagger/client/api/PetApi.scala b/samples/server/petstore/scala-lagom-server/src/main/scala/io/swagger/client/api/PetApi.scala
index c452652ee57b..61ab724d00d2 100644
--- a/samples/server/petstore/scala-lagom-server/src/main/scala/io/swagger/client/api/PetApi.scala
+++ b/samples/server/petstore/scala-lagom-server/src/main/scala/io/swagger/client/api/PetApi.scala
@@ -49,7 +49,7 @@ trait PetApi extends Service {
   def addPet(): ServiceCall[Pet ,Pet]
   
 
-  // apiKey:String  -- not yet supported heder params
+  // apiKey:String  -- not yet supported header params
   /**
     * Deletes a pet
     * 
diff --git a/samples/server/petstore/scala-lagom-server/src/main/scala/io/swagger/client/api/StoreApi.scala b/samples/server/petstore/scala-lagom-server/src/main/scala/io/swagger/client/api/StoreApi.scala
index 2386c182986d..a432ebfccb85 100644
--- a/samples/server/petstore/scala-lagom-server/src/main/scala/io/swagger/client/api/StoreApi.scala
+++ b/samples/server/petstore/scala-lagom-server/src/main/scala/io/swagger/client/api/StoreApi.scala
@@ -53,7 +53,7 @@ trait StoreApi extends Service {
   
   /**
     * Find purchase order by ID
-    * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
     *  
     * @param orderId ID of pet that needs to be fetched 
     * @return Order
diff --git a/samples/server/petstore/scala-play-server/app/api/StoreApi.scala b/samples/server/petstore/scala-play-server/app/api/StoreApi.scala
index 0c0f205203f3..427c188c5b49 100644
--- a/samples/server/petstore/scala-play-server/app/api/StoreApi.scala
+++ b/samples/server/petstore/scala-play-server/app/api/StoreApi.scala
@@ -19,7 +19,7 @@ trait StoreApi {
 
   /**
     * Find purchase order by ID
-    * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
     * @param orderId ID of pet that needs to be fetched
     */
   def getOrderById(orderId: Long): Order
diff --git a/samples/server/petstore/scala-play-server/public/openapi.json b/samples/server/petstore/scala-play-server/public/openapi.json
index 75103813bb29..be5a2b9e163d 100644
--- a/samples/server/petstore/scala-play-server/public/openapi.json
+++ b/samples/server/petstore/scala-play-server/public/openapi.json
@@ -474,7 +474,7 @@
         "tags" : [ "store" ]
       },
       "get" : {
-        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        "description" : "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         "operationId" : "getOrderById",
         "parameters" : [ {
           "description" : "ID of pet that needs to be fetched",
@@ -640,7 +640,7 @@
                 "style" : "simple"
               },
               "X-Expires-After" : {
-                "description" : "date in UTC when toekn expires",
+                "description" : "date in UTC when token expires",
                 "explode" : false,
                 "schema" : {
                   "format" : "date-time",
diff --git a/samples/server/petstore/scalatra/src/main/webapp/WEB-INF/web.xml b/samples/server/petstore/scalatra/src/main/webapp/WEB-INF/web.xml
index bf99b058082c..3003f2941be9 100644
--- a/samples/server/petstore/scalatra/src/main/webapp/WEB-INF/web.xml
+++ b/samples/server/petstore/scalatra/src/main/webapp/WEB-INF/web.xml
@@ -7,7 +7,7 @@
 
   
   
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java
index eb2dd16ccd3e..f57640f36617 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java
@@ -357,14 +357,14 @@ ResponseEntity testEnumParameters(
      * @param stringGroup String in group parameters (optional)
      * @param booleanGroup Boolean in group parameters (optional)
      * @param int64Group Integer in group parameters (optional)
-     * @return Someting wrong (status code 400)
+     * @return Something wrong (status code 400)
      */
     @Operation(
         operationId = "testGroupParameters",
         summary = "Fake endpoint to test group parameters (optional)",
         tags = { "fake" },
         responses = {
-            @ApiResponse(responseCode = "400", description = "Someting wrong")
+            @ApiResponse(responseCode = "400", description = "Something wrong")
         }
     )
     @RequestMapping(
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java
index 32c6eda8560e..7f4f5f24b5a5 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java
@@ -92,7 +92,7 @@ ResponseEntity> getInventory(
 
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
diff --git a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java
index cc4d05b2bb41..05577ea0b5d2 100644
--- a/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java
@@ -97,7 +97,7 @@ default ResponseEntity> getInventory(
 
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
@@ -108,7 +108,7 @@ default ResponseEntity> getInventory(
         tags = { "store" },
         value = "Find purchase order by ID",
         nickname = "getOrderById",
-        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         response = Order.class
     )
     @ApiResponses({
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java
index 1220ac16e008..f1bdf363a81b 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java
@@ -413,7 +413,7 @@ default ResponseEntity testEnumParameters(
      * @param stringGroup String in group parameters (optional)
      * @param booleanGroup Boolean in group parameters (optional)
      * @param int64Group Integer in group parameters (optional)
-     * @return Someting wrong (status code 400)
+     * @return Something wrong (status code 400)
      */
     @ApiOperation(
         tags = { "fake" },
@@ -422,7 +422,7 @@ default ResponseEntity testEnumParameters(
         notes = "Fake endpoint to test group parameters (optional)"
     )
     @ApiResponses({
-        @ApiResponse(code = 400, message = "Someting wrong")
+        @ApiResponse(code = 400, message = "Something wrong")
     })
     @RequestMapping(
         method = RequestMethod.DELETE,
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java
index 1afb547b40ee..05119e430952 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java
@@ -97,7 +97,7 @@ default ResponseEntity> getInventory(
 
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
@@ -108,7 +108,7 @@ default ResponseEntity> getInventory(
         tags = { "store" },
         value = "Find purchase order by ID",
         nickname = "getOrderById",
-        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         response = Order.class
     )
     @ApiResponses({
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml
index 2999e6f2f8d6..658d8a96b30b 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml
@@ -392,7 +392,7 @@ paths:
       - tag: store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -714,7 +714,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java
index 1220ac16e008..f1bdf363a81b 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java
@@ -413,7 +413,7 @@ default ResponseEntity testEnumParameters(
      * @param stringGroup String in group parameters (optional)
      * @param booleanGroup Boolean in group parameters (optional)
      * @param int64Group Integer in group parameters (optional)
-     * @return Someting wrong (status code 400)
+     * @return Something wrong (status code 400)
      */
     @ApiOperation(
         tags = { "fake" },
@@ -422,7 +422,7 @@ default ResponseEntity testEnumParameters(
         notes = "Fake endpoint to test group parameters (optional)"
     )
     @ApiResponses({
-        @ApiResponse(code = 400, message = "Someting wrong")
+        @ApiResponse(code = 400, message = "Something wrong")
     })
     @RequestMapping(
         method = RequestMethod.DELETE,
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java
index 1afb547b40ee..05119e430952 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java
@@ -97,7 +97,7 @@ default ResponseEntity> getInventory(
 
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
@@ -108,7 +108,7 @@ default ResponseEntity> getInventory(
         tags = { "store" },
         value = "Find purchase order by ID",
         nickname = "getOrderById",
-        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         response = Order.class
     )
     @ApiResponses({
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-beanvalidation/src/main/resources/openapi.yaml
index 2999e6f2f8d6..658d8a96b30b 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/resources/openapi.yaml
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/resources/openapi.yaml
@@ -392,7 +392,7 @@ paths:
       - tag: store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -714,7 +714,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java
index 261a033dd80d..a2d0eb80dfbc 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java
@@ -381,7 +381,7 @@ default ResponseEntity testEnumParameters(
      * @param stringGroup String in group parameters (optional)
      * @param booleanGroup Boolean in group parameters (optional)
      * @param int64Group Integer in group parameters (optional)
-     * @return Someting wrong (status code 400)
+     * @return Something wrong (status code 400)
      */
     @ApiOperation(
         tags = { "fake" },
@@ -390,7 +390,7 @@ default ResponseEntity testEnumParameters(
         notes = "Fake endpoint to test group parameters (optional)"
     )
     @ApiResponses({
-        @ApiResponse(code = 400, message = "Someting wrong")
+        @ApiResponse(code = 400, message = "Something wrong")
     })
     @RequestMapping(
         method = RequestMethod.DELETE,
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java
index 03f67c302ce9..2cd684b90f5c 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java
@@ -234,7 +234,7 @@ default ResponseEntity testEnumParameters(List enumHeaderStringArr
      * @param stringGroup String in group parameters (optional)
      * @param booleanGroup Boolean in group parameters (optional)
      * @param int64Group Integer in group parameters (optional)
-     * @return Someting wrong (status code 400)
+     * @return Something wrong (status code 400)
      * @see FakeApi#testGroupParameters
      */
     default ResponseEntity testGroupParameters(Integer requiredStringGroup,
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java
index c9e8abe50bf6..1dabfb6ff4f1 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java
@@ -91,7 +91,7 @@ default ResponseEntity> getInventory(
 
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
@@ -102,7 +102,7 @@ default ResponseEntity> getInventory(
         tags = { "store" },
         value = "Find purchase order by ID",
         nickname = "getOrderById",
-        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         response = Order.class
     )
     @ApiResponses({
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java
index e9b7146b52a8..c4c812a9bb25 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java
@@ -52,7 +52,7 @@ default ResponseEntity> getInventory() {
 
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-delegate-j8/src/main/resources/openapi.yaml
index 2999e6f2f8d6..658d8a96b30b 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/resources/openapi.yaml
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/resources/openapi.yaml
@@ -392,7 +392,7 @@ paths:
       - tag: store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -714,7 +714,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java
index 261a033dd80d..a2d0eb80dfbc 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java
@@ -381,7 +381,7 @@ default ResponseEntity testEnumParameters(
      * @param stringGroup String in group parameters (optional)
      * @param booleanGroup Boolean in group parameters (optional)
      * @param int64Group Integer in group parameters (optional)
-     * @return Someting wrong (status code 400)
+     * @return Something wrong (status code 400)
      */
     @ApiOperation(
         tags = { "fake" },
@@ -390,7 +390,7 @@ default ResponseEntity testEnumParameters(
         notes = "Fake endpoint to test group parameters (optional)"
     )
     @ApiResponses({
-        @ApiResponse(code = 400, message = "Someting wrong")
+        @ApiResponse(code = 400, message = "Something wrong")
     })
     @RequestMapping(
         method = RequestMethod.DELETE,
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java
index 03f67c302ce9..2cd684b90f5c 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java
@@ -234,7 +234,7 @@ default ResponseEntity testEnumParameters(List enumHeaderStringArr
      * @param stringGroup String in group parameters (optional)
      * @param booleanGroup Boolean in group parameters (optional)
      * @param int64Group Integer in group parameters (optional)
-     * @return Someting wrong (status code 400)
+     * @return Something wrong (status code 400)
      * @see FakeApi#testGroupParameters
      */
     default ResponseEntity testGroupParameters(Integer requiredStringGroup,
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java
index c9e8abe50bf6..1dabfb6ff4f1 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java
@@ -91,7 +91,7 @@ default ResponseEntity> getInventory(
 
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
@@ -102,7 +102,7 @@ default ResponseEntity> getInventory(
         tags = { "store" },
         value = "Find purchase order by ID",
         nickname = "getOrderById",
-        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         response = Order.class
     )
     @ApiResponses({
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java
index e9b7146b52a8..c4c812a9bb25 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java
@@ -52,7 +52,7 @@ default ResponseEntity> getInventory() {
 
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
diff --git a/samples/server/petstore/springboot-delegate/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-delegate/src/main/resources/openapi.yaml
index 2999e6f2f8d6..658d8a96b30b 100644
--- a/samples/server/petstore/springboot-delegate/src/main/resources/openapi.yaml
+++ b/samples/server/petstore/springboot-delegate/src/main/resources/openapi.yaml
@@ -392,7 +392,7 @@ paths:
       - tag: store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -714,7 +714,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java
index 3044b699b0d0..0272594908a5 100644
--- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java
@@ -71,7 +71,7 @@ default ResponseEntity> getInventory(
 
     /**
      * GET /store/order/{orderId} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/resources/openapi.yaml
index b629acd9d7f6..ce4ba1e4a4ea 100644
--- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/resources/openapi.yaml
+++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/resources/openapi.yaml
@@ -386,7 +386,7 @@ paths:
       - tag: store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java
index 88b13d87041c..0126531c3b80 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java
@@ -411,7 +411,7 @@ default ResponseEntity testEnumParameters(
      * @param requiredInt64Group Required Integer in group parameters (required)
      * @param stringGroup String in group parameters (optional)
      * @param int64Group Integer in group parameters (optional)
-     * @return Someting wrong (status code 400)
+     * @return Something wrong (status code 400)
      */
     @ApiOperation(
         tags = { "fake" },
@@ -420,7 +420,7 @@ default ResponseEntity testEnumParameters(
         notes = "Fake endpoint to test group parameters (optional)"
     )
     @ApiResponses({
-        @ApiResponse(code = 400, message = "Someting wrong")
+        @ApiResponse(code = 400, message = "Something wrong")
     })
     @ApiImplicitParams({
         @ApiImplicitParam(name = "required_boolean_group", value = "Required Boolean in group parameters", required = true, dataType = "Boolean", paramType = "header"),
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java
index 1afb547b40ee..05119e430952 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java
@@ -97,7 +97,7 @@ default ResponseEntity> getInventory(
 
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
@@ -108,7 +108,7 @@ default ResponseEntity> getInventory(
         tags = { "store" },
         value = "Find purchase order by ID",
         nickname = "getOrderById",
-        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         response = Order.class
     )
     @ApiResponses({
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml
index 2999e6f2f8d6..658d8a96b30b 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml
@@ -392,7 +392,7 @@ paths:
       - tag: store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -714,7 +714,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java
index f598c332026d..f6501130e36f 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java
@@ -396,7 +396,7 @@ default Mono> testEnumParameters(
      * @param stringGroup String in group parameters (optional)
      * @param booleanGroup Boolean in group parameters (optional)
      * @param int64Group Integer in group parameters (optional)
-     * @return Someting wrong (status code 400)
+     * @return Something wrong (status code 400)
      */
     @ApiOperation(
         tags = { "fake" },
@@ -405,7 +405,7 @@ default Mono> testEnumParameters(
         notes = "Fake endpoint to test group parameters (optional)"
     )
     @ApiResponses({
-        @ApiResponse(code = 400, message = "Someting wrong")
+        @ApiResponse(code = 400, message = "Something wrong")
     })
     @RequestMapping(
         method = RequestMethod.DELETE,
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java
index 67da639c92cc..af978b31c2f8 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java
@@ -265,7 +265,7 @@ default Mono> testEnumParameters(List enumHeaderStr
      * @param stringGroup String in group parameters (optional)
      * @param booleanGroup Boolean in group parameters (optional)
      * @param int64Group Integer in group parameters (optional)
-     * @return Someting wrong (status code 400)
+     * @return Something wrong (status code 400)
      * @see FakeApi#testGroupParameters
      */
     default Mono> testGroupParameters(Integer requiredStringGroup,
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java
index 826fe6283a3c..00999c7fd6bb 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java
@@ -97,7 +97,7 @@ default Mono>> getInventory(
 
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
@@ -108,7 +108,7 @@ default Mono>> getInventory(
         tags = { "store" },
         value = "Find purchase order by ID",
         nickname = "getOrderById",
-        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         response = Order.class
     )
     @ApiResponses({
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java
index 0d94aece4221..48ed75406849 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java
@@ -62,7 +62,7 @@ default Mono>> getInventory(ServerWebExchang
 
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
diff --git a/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml
index 2999e6f2f8d6..658d8a96b30b 100644
--- a/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml
+++ b/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml
@@ -392,7 +392,7 @@ paths:
       - tag: store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -714,7 +714,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java
index 599c2a879c59..e1cfb57d6029 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java
@@ -381,7 +381,7 @@ default ResponseEntity testEnumParameters(
      * @param stringGroup String in group parameters (optional)
      * @param booleanGroup Boolean in group parameters (optional)
      * @param int64Group Integer in group parameters (optional)
-     * @return Someting wrong (status code 400)
+     * @return Something wrong (status code 400)
      */
     @ApiOperation(
         tags = { "fake" },
@@ -390,7 +390,7 @@ default ResponseEntity testEnumParameters(
         notes = "Fake endpoint to test group parameters (optional)"
     )
     @ApiResponses({
-        @ApiResponse(code = 400, message = "Someting wrong")
+        @ApiResponse(code = 400, message = "Something wrong")
     })
     @RequestMapping(
         method = RequestMethod.DELETE,
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java
index 397c677c9949..5242544c6d88 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java
@@ -234,7 +234,7 @@ default ResponseEntity testEnumParameters(List enumHeaderStringArr
      * @param stringGroup String in group parameters (optional)
      * @param booleanGroup Boolean in group parameters (optional)
      * @param int64Group Integer in group parameters (optional)
-     * @return Someting wrong (status code 400)
+     * @return Something wrong (status code 400)
      * @see FakeApi#testGroupParameters
      */
     default ResponseEntity testGroupParameters(Integer requiredStringGroup,
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java
index c9e8abe50bf6..1dabfb6ff4f1 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java
@@ -91,7 +91,7 @@ default ResponseEntity> getInventory(
 
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
@@ -102,7 +102,7 @@ default ResponseEntity> getInventory(
         tags = { "store" },
         value = "Find purchase order by ID",
         nickname = "getOrderById",
-        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         response = Order.class
     )
     @ApiResponses({
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java
index e9b7146b52a8..c4c812a9bb25 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java
@@ -52,7 +52,7 @@ default ResponseEntity> getInventory() {
 
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/resources/openapi.yaml
index d28bcff839b2..e0a2517abd90 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/resources/openapi.yaml
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/resources/openapi.yaml
@@ -391,7 +391,7 @@ paths:
       - tag: store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -713,7 +713,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java
index 599c2a879c59..e1cfb57d6029 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java
@@ -381,7 +381,7 @@ default ResponseEntity testEnumParameters(
      * @param stringGroup String in group parameters (optional)
      * @param booleanGroup Boolean in group parameters (optional)
      * @param int64Group Integer in group parameters (optional)
-     * @return Someting wrong (status code 400)
+     * @return Something wrong (status code 400)
      */
     @ApiOperation(
         tags = { "fake" },
@@ -390,7 +390,7 @@ default ResponseEntity testEnumParameters(
         notes = "Fake endpoint to test group parameters (optional)"
     )
     @ApiResponses({
-        @ApiResponse(code = 400, message = "Someting wrong")
+        @ApiResponse(code = 400, message = "Something wrong")
     })
     @RequestMapping(
         method = RequestMethod.DELETE,
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiDelegate.java
index 397c677c9949..5242544c6d88 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiDelegate.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiDelegate.java
@@ -234,7 +234,7 @@ default ResponseEntity testEnumParameters(List enumHeaderStringArr
      * @param stringGroup String in group parameters (optional)
      * @param booleanGroup Boolean in group parameters (optional)
      * @param int64Group Integer in group parameters (optional)
-     * @return Someting wrong (status code 400)
+     * @return Something wrong (status code 400)
      * @see FakeApi#testGroupParameters
      */
     default ResponseEntity testGroupParameters(Integer requiredStringGroup,
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java
index c9e8abe50bf6..1dabfb6ff4f1 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java
@@ -91,7 +91,7 @@ default ResponseEntity> getInventory(
 
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
@@ -102,7 +102,7 @@ default ResponseEntity> getInventory(
         tags = { "store" },
         value = "Find purchase order by ID",
         nickname = "getOrderById",
-        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         response = Order.class
     )
     @ApiResponses({
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApiDelegate.java
index e9b7146b52a8..c4c812a9bb25 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApiDelegate.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApiDelegate.java
@@ -52,7 +52,7 @@ default ResponseEntity> getInventory() {
 
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/resources/openapi.yaml
index d28bcff839b2..e0a2517abd90 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/resources/openapi.yaml
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/resources/openapi.yaml
@@ -391,7 +391,7 @@ paths:
       - tag: store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -713,7 +713,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java
index c07a605db9de..6140ef834b04 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java
@@ -413,7 +413,7 @@ default ResponseEntity testEnumParameters(
      * @param stringGroup String in group parameters (optional)
      * @param booleanGroup Boolean in group parameters (optional)
      * @param int64Group Integer in group parameters (optional)
-     * @return Someting wrong (status code 400)
+     * @return Something wrong (status code 400)
      */
     @ApiOperation(
         tags = { "fake" },
@@ -422,7 +422,7 @@ default ResponseEntity testEnumParameters(
         notes = "Fake endpoint to test group parameters (optional)"
     )
     @ApiResponses({
-        @ApiResponse(code = 400, message = "Someting wrong")
+        @ApiResponse(code = 400, message = "Something wrong")
     })
     @RequestMapping(
         method = RequestMethod.DELETE,
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java
index 1afb547b40ee..05119e430952 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java
@@ -97,7 +97,7 @@ default ResponseEntity> getInventory(
 
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
@@ -108,7 +108,7 @@ default ResponseEntity> getInventory(
         tags = { "store" },
         value = "Find purchase order by ID",
         nickname = "getOrderById",
-        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         response = Order.class
     )
     @ApiResponses({
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/resources/openapi.yaml
index d28bcff839b2..e0a2517abd90 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/resources/openapi.yaml
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/resources/openapi.yaml
@@ -391,7 +391,7 @@ paths:
       - tag: store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -713,7 +713,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java
index c07a605db9de..6140ef834b04 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java
@@ -413,7 +413,7 @@ default ResponseEntity testEnumParameters(
      * @param stringGroup String in group parameters (optional)
      * @param booleanGroup Boolean in group parameters (optional)
      * @param int64Group Integer in group parameters (optional)
-     * @return Someting wrong (status code 400)
+     * @return Something wrong (status code 400)
      */
     @ApiOperation(
         tags = { "fake" },
@@ -422,7 +422,7 @@ default ResponseEntity testEnumParameters(
         notes = "Fake endpoint to test group parameters (optional)"
     )
     @ApiResponses({
-        @ApiResponse(code = 400, message = "Someting wrong")
+        @ApiResponse(code = 400, message = "Something wrong")
     })
     @RequestMapping(
         method = RequestMethod.DELETE,
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java
index 1afb547b40ee..05119e430952 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java
@@ -97,7 +97,7 @@ default ResponseEntity> getInventory(
 
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
@@ -108,7 +108,7 @@ default ResponseEntity> getInventory(
         tags = { "store" },
         value = "Find purchase order by ID",
         nickname = "getOrderById",
-        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         response = Order.class
     )
     @ApiResponses({
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-spring-pageable/src/main/resources/openapi.yaml
index d28bcff839b2..e0a2517abd90 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/resources/openapi.yaml
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/resources/openapi.yaml
@@ -391,7 +391,7 @@ paths:
       - tag: store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -713,7 +713,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java
index b8085e150ec5..c4663cf12fdc 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java
@@ -413,7 +413,7 @@ default ResponseEntity testEnumParameters(
      * @param stringGroup String in group parameters (optional)
      * @param booleanGroup Boolean in group parameters (optional)
      * @param int64Group Integer in group parameters (optional)
-     * @return Someting wrong (status code 400)
+     * @return Something wrong (status code 400)
      */
     @ApiOperation(
         tags = { "fake" },
@@ -422,7 +422,7 @@ default ResponseEntity testEnumParameters(
         notes = "Fake endpoint to test group parameters (optional)"
     )
     @ApiResponses({
-        @ApiResponse(code = 400, message = "Someting wrong")
+        @ApiResponse(code = 400, message = "Something wrong")
     })
     @RequestMapping(
         method = RequestMethod.DELETE,
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java
index 1afb547b40ee..05119e430952 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java
@@ -97,7 +97,7 @@ default ResponseEntity> getInventory(
 
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
@@ -108,7 +108,7 @@ default ResponseEntity> getInventory(
         tags = { "store" },
         value = "Find purchase order by ID",
         nickname = "getOrderById",
-        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         response = Order.class
     )
     @ApiResponses({
diff --git a/samples/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml
index 2999e6f2f8d6..658d8a96b30b 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml
+++ b/samples/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml
@@ -392,7 +392,7 @@ paths:
       - tag: store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -714,7 +714,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java
index d610b3cc014d..269695baca4c 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java
@@ -422,7 +422,7 @@ default ResponseEntity testEnumParameters(
      * @param stringGroup String in group parameters (optional)
      * @param booleanGroup Boolean in group parameters (optional)
      * @param int64Group Integer in group parameters (optional)
-     * @return Someting wrong (status code 400)
+     * @return Something wrong (status code 400)
      */
     @ApiVirtual
     @Operation(
@@ -430,7 +430,7 @@ default ResponseEntity testEnumParameters(
         summary = "Fake endpoint to test group parameters (optional)",
         tags = { "fake" },
         responses = {
-            @ApiResponse(responseCode = "400", description = "Someting wrong")
+            @ApiResponse(responseCode = "400", description = "Something wrong")
         }
     )
     @RequestMapping(
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java
index 9f5d667b14ed..4239e75c31b8 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java
@@ -107,7 +107,7 @@ default ResponseEntity> getInventory(
 
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
diff --git a/samples/server/petstore/springboot-virtualan/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-virtualan/src/main/resources/openapi.yaml
index 2999e6f2f8d6..658d8a96b30b 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/resources/openapi.yaml
+++ b/samples/server/petstore/springboot-virtualan/src/main/resources/openapi.yaml
@@ -392,7 +392,7 @@ paths:
       - tag: store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -714,7 +714,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java
index 1220ac16e008..f1bdf363a81b 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java
@@ -413,7 +413,7 @@ default ResponseEntity testEnumParameters(
      * @param stringGroup String in group parameters (optional)
      * @param booleanGroup Boolean in group parameters (optional)
      * @param int64Group Integer in group parameters (optional)
-     * @return Someting wrong (status code 400)
+     * @return Something wrong (status code 400)
      */
     @ApiOperation(
         tags = { "fake" },
@@ -422,7 +422,7 @@ default ResponseEntity testEnumParameters(
         notes = "Fake endpoint to test group parameters (optional)"
     )
     @ApiResponses({
-        @ApiResponse(code = 400, message = "Someting wrong")
+        @ApiResponse(code = 400, message = "Something wrong")
     })
     @RequestMapping(
         method = RequestMethod.DELETE,
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java
index 1afb547b40ee..05119e430952 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java
@@ -97,7 +97,7 @@ default ResponseEntity> getInventory(
 
     /**
      * GET /store/order/{order_id} : Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      *
      * @param orderId ID of pet that needs to be fetched (required)
      * @return successful operation (status code 200)
@@ -108,7 +108,7 @@ default ResponseEntity> getInventory(
         tags = { "store" },
         value = "Find purchase order by ID",
         nickname = "getOrderById",
-        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions",
         response = Order.class
     )
     @ApiResponses({
diff --git a/samples/server/petstore/springboot/src/main/resources/openapi.yaml b/samples/server/petstore/springboot/src/main/resources/openapi.yaml
index 2999e6f2f8d6..658d8a96b30b 100644
--- a/samples/server/petstore/springboot/src/main/resources/openapi.yaml
+++ b/samples/server/petstore/springboot/src/main/resources/openapi.yaml
@@ -392,7 +392,7 @@ paths:
       - tag: store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -714,7 +714,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake