diff --git a/modules/openapi-generator/src/main/resources/ruby-client/README.mustache b/modules/openapi-generator/src/main/resources/ruby-client/README.mustache
index a9f7a508232..5f589346960 100644
--- a/modules/openapi-generator/src/main/resources/ruby-client/README.mustache
+++ b/modules/openapi-generator/src/main/resources/ruby-client/README.mustache
@@ -75,9 +75,9 @@ require '{{{gemName}}}'
   # Configure a proc to get access tokens in lieu of the static access_token configuration
   config.access_token_getter = -> { 'YOUR TOKEN GETTER PROC' } {{/isBasicBearer}}{{/isBasic}}{{#isApiKey}}
   # Configure API key authorization: {{{name}}}
-  config.api_key['{{{name}}}'] = 'YOUR API KEY'
+  config.api_key['{{{keyParamName}}}'] = 'YOUR API KEY'
   # Uncomment the following line to set a prefix for the API key, e.g. 'Bearer' (defaults to nil)
-  # config.api_key_prefix['{{{name}}}'] = 'Bearer'{{/isApiKey}}{{#isOAuth}}
+  # config.api_key_prefix['{{{keyParamName}}}'] = 'Bearer'{{/isApiKey}}{{#isOAuth}}
   # Configure OAuth2 access token for authorization: {{{name}}}
   config.access_token = 'YOUR ACCESS TOKEN'
   # Configure a proc to get access tokens in lieu of the static access_token configuration
diff --git a/modules/openapi-generator/src/main/resources/ruby-client/api_doc.mustache b/modules/openapi-generator/src/main/resources/ruby-client/api_doc.mustache
index acb2750d525..ab2e666e1eb 100644
--- a/modules/openapi-generator/src/main/resources/ruby-client/api_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/ruby-client/api_doc.mustache
@@ -37,9 +37,9 @@ require '{{{gemName}}}'
   # Configure Bearer authorization{{#bearerFormat}} ({{{.}}}){{/bearerFormat}}: {{{name}}}
   config.access_token = 'YOUR_BEARER_TOKEN'{{/isBasicBearer}}{{/isBasic}}{{#isApiKey}}
   # Configure API key authorization: {{{name}}}
-  config.api_key['{{{name}}}'] = 'YOUR API KEY'
+  config.api_key['{{{keyParamName}}}'] = 'YOUR API KEY'
   # Uncomment the following line to set a prefix for the API key, e.g. 'Bearer' (defaults to nil)
-  # config.api_key_prefix['{{{name}}}'] = 'Bearer'{{/isApiKey}}{{#isOAuth}}
+  # config.api_key_prefix['{{{keyParamName}}}'] = 'Bearer'{{/isApiKey}}{{#isOAuth}}
   # Configure OAuth2 access token for authorization: {{{name}}}
   config.access_token = 'YOUR ACCESS TOKEN'{{/isOAuth}}
 {{/authMethods}}end
diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/README.md b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/README.md
index 2d102a82c77..4366b83f375 100644
--- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/README.md
+++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/README.md
@@ -60,14 +60,14 @@ require 'x_auth_id_alias'
 # Setup authorization
 XAuthIDAlias.configure do |config|
   # Configure API key authorization: api_key
+  config.api_key['X-Api-Key'] = 'YOUR API KEY'
+  # Uncomment the following line to set a prefix for the API key, e.g. 'Bearer' (defaults to nil)
+  # config.api_key_prefix['X-Api-Key'] = 'Bearer'
+
+  # Configure API key authorization: api_key_query
   config.api_key['api_key'] = 'YOUR API KEY'
   # Uncomment the following line to set a prefix for the API key, e.g. 'Bearer' (defaults to nil)
   # config.api_key_prefix['api_key'] = 'Bearer'
-
-  # Configure API key authorization: api_key_query
-  config.api_key['api_key_query'] = 'YOUR API KEY'
-  # Uncomment the following line to set a prefix for the API key, e.g. 'Bearer' (defaults to nil)
-  # config.api_key_prefix['api_key_query'] = 'Bearer'
 end
 
 api_instance = XAuthIDAlias::UsageApi.new
diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/docs/UsageApi.md b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/docs/UsageApi.md
index 0ec8d9fdfec..87c79aa8133 100644
--- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/docs/UsageApi.md
+++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/docs/UsageApi.md
@@ -26,14 +26,14 @@ require 'x_auth_id_alias'
 # setup authorization
 XAuthIDAlias.configure do |config|
   # Configure API key authorization: api_key
+  config.api_key['X-Api-Key'] = 'YOUR API KEY'
+  # Uncomment the following line to set a prefix for the API key, e.g. 'Bearer' (defaults to nil)
+  # config.api_key_prefix['X-Api-Key'] = 'Bearer'
+
+  # Configure API key authorization: api_key_query
   config.api_key['api_key'] = 'YOUR API KEY'
   # Uncomment the following line to set a prefix for the API key, e.g. 'Bearer' (defaults to nil)
   # config.api_key_prefix['api_key'] = 'Bearer'
-
-  # Configure API key authorization: api_key_query
-  config.api_key['api_key_query'] = 'YOUR API KEY'
-  # Uncomment the following line to set a prefix for the API key, e.g. 'Bearer' (defaults to nil)
-  # config.api_key_prefix['api_key_query'] = 'Bearer'
 end
 
 api_instance = XAuthIDAlias::UsageApi.new
@@ -99,14 +99,14 @@ require 'x_auth_id_alias'
 # setup authorization
 XAuthIDAlias.configure do |config|
   # Configure API key authorization: api_key
+  config.api_key['X-Api-Key'] = 'YOUR API KEY'
+  # Uncomment the following line to set a prefix for the API key, e.g. 'Bearer' (defaults to nil)
+  # config.api_key_prefix['X-Api-Key'] = 'Bearer'
+
+  # Configure API key authorization: api_key_query
   config.api_key['api_key'] = 'YOUR API KEY'
   # Uncomment the following line to set a prefix for the API key, e.g. 'Bearer' (defaults to nil)
   # config.api_key_prefix['api_key'] = 'Bearer'
-
-  # Configure API key authorization: api_key_query
-  config.api_key['api_key_query'] = 'YOUR API KEY'
-  # Uncomment the following line to set a prefix for the API key, e.g. 'Bearer' (defaults to nil)
-  # config.api_key_prefix['api_key_query'] = 'Bearer'
 end
 
 api_instance = XAuthIDAlias::UsageApi.new
@@ -172,9 +172,9 @@ require 'x_auth_id_alias'
 # setup authorization
 XAuthIDAlias.configure do |config|
   # Configure API key authorization: api_key
-  config.api_key['api_key'] = 'YOUR API KEY'
+  config.api_key['X-Api-Key'] = 'YOUR API KEY'
   # Uncomment the following line to set a prefix for the API key, e.g. 'Bearer' (defaults to nil)
-  # config.api_key_prefix['api_key'] = 'Bearer'
+  # config.api_key_prefix['X-Api-Key'] = 'Bearer'
 end
 
 api_instance = XAuthIDAlias::UsageApi.new
@@ -240,9 +240,9 @@ require 'x_auth_id_alias'
 # setup authorization
 XAuthIDAlias.configure do |config|
   # Configure API key authorization: api_key_query
-  config.api_key['api_key_query'] = 'YOUR API KEY'
+  config.api_key['api_key'] = 'YOUR API KEY'
   # Uncomment the following line to set a prefix for the API key, e.g. 'Bearer' (defaults to nil)
-  # config.api_key_prefix['api_key_query'] = 'Bearer'
+  # config.api_key_prefix['api_key'] = 'Bearer'
 end
 
 api_instance = XAuthIDAlias::UsageApi.new