diff --git a/README.md b/README.md
index b3178540b78b..cec91889ca82 100644
--- a/README.md
+++ b/README.md
@@ -1182,6 +1182,7 @@ Here is a list of template creators:
    * Scala Finch: @jimschubert [:heart:](https://www.patreon.com/jimschubert)
    * Scala Lagom: @gmkumar2005
    * Scala Play: @adigerber
+   * TypeScript NestJS: @aryobenholzner
  * Documentation
    * AsciiDoc: @man-at-home
    * HTML Doc 2: @jhitchcock
diff --git a/modules/openapi-generator/src/test/resources/3_0/cpp-restsdk/petstore.yaml b/modules/openapi-generator/src/test/resources/3_0/cpp-restsdk/petstore.yaml
index deafefce841f..294e342164cd 100644
--- a/modules/openapi-generator/src/test/resources/3_0/cpp-restsdk/petstore.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/cpp-restsdk/petstore.yaml
@@ -677,7 +677,7 @@ components:
             'read:pets': read your pets
     api_key:
       type: apiKey
-      name: api_key
+      name: api_key_name
       in: header
   schemas:
     Order:
diff --git a/samples/client/petstore/cpp-restsdk/client/src/api/PetApi.cpp b/samples/client/petstore/cpp-restsdk/client/src/api/PetApi.cpp
index 27c7ce2305e1..8d496a0d879f 100644
--- a/samples/client/petstore/cpp-restsdk/client/src/api/PetApi.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/src/api/PetApi.cpp
@@ -761,7 +761,7 @@ pplx::task<std::shared_ptr<Pet>> PetApi::getPetById(int64_t petId) const
         utility::string_t localVarApiKey = localVarApiConfiguration->getApiKey(utility::conversions::to_string_t("api_key"));
         if ( localVarApiKey.size() > 0 )
         {
-            localVarHeaderParams[utility::conversions::to_string_t("api_key")] = localVarApiKey;
+            localVarHeaderParams[utility::conversions::to_string_t("api_key_name")] = localVarApiKey;
         }
     }
 
diff --git a/samples/client/petstore/cpp-restsdk/client/src/api/StoreApi.cpp b/samples/client/petstore/cpp-restsdk/client/src/api/StoreApi.cpp
index 30418e536683..b1cd62f193a9 100644
--- a/samples/client/petstore/cpp-restsdk/client/src/api/StoreApi.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/src/api/StoreApi.cpp
@@ -208,7 +208,7 @@ pplx::task<std::map<utility::string_t, int32_t>> StoreApi::getInventory() const
         utility::string_t localVarApiKey = localVarApiConfiguration->getApiKey(utility::conversions::to_string_t("api_key"));
         if ( localVarApiKey.size() > 0 )
         {
-            localVarHeaderParams[utility::conversions::to_string_t("api_key")] = localVarApiKey;
+            localVarHeaderParams[utility::conversions::to_string_t("api_key_name")] = localVarApiKey;
         }
     }
 
diff --git a/samples/client/petstore/cpp-restsdk/client/src/api/UserApi.cpp b/samples/client/petstore/cpp-restsdk/client/src/api/UserApi.cpp
index 10da7e99e95b..0290b3ff18c5 100644
--- a/samples/client/petstore/cpp-restsdk/client/src/api/UserApi.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/src/api/UserApi.cpp
@@ -126,7 +126,7 @@ pplx::task<void> UserApi::createUser(std::shared_ptr<User> user) const
         utility::string_t localVarApiKey = localVarApiConfiguration->getApiKey(utility::conversions::to_string_t("api_key"));
         if ( localVarApiKey.size() > 0 )
         {
-            localVarHeaderParams[utility::conversions::to_string_t("api_key")] = localVarApiKey;
+            localVarHeaderParams[utility::conversions::to_string_t("api_key_name")] = localVarApiKey;
         }
     }
 
@@ -265,7 +265,7 @@ pplx::task<void> UserApi::createUsersWithArrayInput(std::vector<std::shared_ptr<
         utility::string_t localVarApiKey = localVarApiConfiguration->getApiKey(utility::conversions::to_string_t("api_key"));
         if ( localVarApiKey.size() > 0 )
         {
-            localVarHeaderParams[utility::conversions::to_string_t("api_key")] = localVarApiKey;
+            localVarHeaderParams[utility::conversions::to_string_t("api_key_name")] = localVarApiKey;
         }
     }
 
@@ -404,7 +404,7 @@ pplx::task<void> UserApi::createUsersWithListInput(std::vector<std::shared_ptr<U
         utility::string_t localVarApiKey = localVarApiConfiguration->getApiKey(utility::conversions::to_string_t("api_key"));
         if ( localVarApiKey.size() > 0 )
         {
-            localVarHeaderParams[utility::conversions::to_string_t("api_key")] = localVarApiKey;
+            localVarHeaderParams[utility::conversions::to_string_t("api_key_name")] = localVarApiKey;
         }
     }
 
@@ -516,7 +516,7 @@ pplx::task<void> UserApi::deleteUser(utility::string_t username) const
         utility::string_t localVarApiKey = localVarApiConfiguration->getApiKey(utility::conversions::to_string_t("api_key"));
         if ( localVarApiKey.size() > 0 )
         {
-            localVarHeaderParams[utility::conversions::to_string_t("api_key")] = localVarApiKey;
+            localVarHeaderParams[utility::conversions::to_string_t("api_key_name")] = localVarApiKey;
         }
     }
 
@@ -889,7 +889,7 @@ pplx::task<void> UserApi::logoutUser() const
         utility::string_t localVarApiKey = localVarApiConfiguration->getApiKey(utility::conversions::to_string_t("api_key"));
         if ( localVarApiKey.size() > 0 )
         {
-            localVarHeaderParams[utility::conversions::to_string_t("api_key")] = localVarApiKey;
+            localVarHeaderParams[utility::conversions::to_string_t("api_key_name")] = localVarApiKey;
         }
     }
 
@@ -1024,7 +1024,7 @@ pplx::task<void> UserApi::updateUser(utility::string_t username, std::shared_ptr
         utility::string_t localVarApiKey = localVarApiConfiguration->getApiKey(utility::conversions::to_string_t("api_key"));
         if ( localVarApiKey.size() > 0 )
         {
-            localVarHeaderParams[utility::conversions::to_string_t("api_key")] = localVarApiKey;
+            localVarHeaderParams[utility::conversions::to_string_t("api_key_name")] = localVarApiKey;
         }
     }
 
diff --git a/samples/client/petstore/cpp-restsdk/client/src/api/UserOrPetApi.cpp b/samples/client/petstore/cpp-restsdk/client/src/api/UserOrPetApi.cpp
index 76aeb28030be..17375f438231 100644
--- a/samples/client/petstore/cpp-restsdk/client/src/api/UserOrPetApi.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/src/api/UserOrPetApi.cpp
@@ -126,7 +126,7 @@ pplx::task<void> UserOrPetApi::createUserOrPet(std::shared_ptr<CreateUserOrPet_r
         utility::string_t localVarApiKey = localVarApiConfiguration->getApiKey(utility::conversions::to_string_t("api_key"));
         if ( localVarApiKey.size() > 0 )
         {
-            localVarHeaderParams[utility::conversions::to_string_t("api_key")] = localVarApiKey;
+            localVarHeaderParams[utility::conversions::to_string_t("api_key_name")] = localVarApiKey;
         }
     }