diff --git a/changes/20241024085441.bugfix b/changes/20241024085441.bugfix
new file mode 100644
index 0000000..da364db
--- /dev/null
+++ b/changes/20241024085441.bugfix
@@ -0,0 +1 @@
+:bug: Fix breaking changes
diff --git a/client/extension_builders_link.go b/client/extension_builders_link.go
index fda4939..8b5f3a4 100644
--- a/client/extension_builders_link.go
+++ b/client/extension_builders_link.go
@@ -46,13 +46,13 @@ func (a *CMSISBuildersAPIService) FollowBuildersLink(r *ApiListCmsisBuildersRequ
 	localVarFormParams := url.Values{}
 
 	if r.embed != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "embed", r.embed, "")
+		wrapParameterAddToQuery(localVarQueryParams, "embed", r.embed, "")
 	}
 	if r.limit != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "")
+		wrapParameterAddToQuery(localVarQueryParams, "limit", r.limit, "")
 	}
 	if r.offset != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "")
+		wrapParameterAddToQuery(localVarQueryParams, "offset", r.offset, "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -72,10 +72,10 @@ func (a *CMSISBuildersAPIService) FollowBuildersLink(r *ApiListCmsisBuildersRequ
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
 	if r.acceptVersion != nil {
-		parameterAddToHeaderOrQuery(localVarHeaderParams, "Accept-Version", r.acceptVersion, "")
+		wrapParameterAddToHeader(localVarHeaderParams, "Accept-Version", r.acceptVersion, "")
 	}
 	if r.ifNoneMatch != nil {
-		parameterAddToHeaderOrQuery(localVarHeaderParams, "if-none-match", r.ifNoneMatch, "")
+		wrapParameterAddToHeader(localVarHeaderParams, "if-none-match", r.ifNoneMatch, "")
 	}
 	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
 	if err != nil {
diff --git a/client/extension_buildjobs_link.go b/client/extension_buildjobs_link.go
index cde05be..f7bbe8f 100644
--- a/client/extension_buildjobs_link.go
+++ b/client/extension_buildjobs_link.go
@@ -46,13 +46,13 @@ func (a *BuildJobsAPIService) FollowBuildJobLink(r *ApiListBuildJobRequest, link
 	localVarFormParams := url.Values{}
 
 	if r.embed != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "embed", r.embed, "")
+		wrapParameterAddToQuery(localVarQueryParams, "embed", r.embed, "")
 	}
 	if r.limit != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "")
+		wrapParameterAddToQuery(localVarQueryParams, "limit", r.limit, "")
 	}
 	if r.offset != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "")
+		wrapParameterAddToQuery(localVarQueryParams, "offset", r.offset, "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -72,10 +72,10 @@ func (a *BuildJobsAPIService) FollowBuildJobLink(r *ApiListBuildJobRequest, link
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
 	if r.acceptVersion != nil {
-		parameterAddToHeaderOrQuery(localVarHeaderParams, "Accept-Version", r.acceptVersion, "")
+		wrapParameterAddToHeader(localVarHeaderParams, "Accept-Version", r.acceptVersion, "")
 	}
 	if r.ifNoneMatch != nil {
-		parameterAddToHeaderOrQuery(localVarHeaderParams, "if-none-match", r.ifNoneMatch, "")
+		wrapParameterAddToHeader(localVarHeaderParams, "if-none-match", r.ifNoneMatch, "")
 	}
 	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
 	if err != nil {
diff --git a/client/extension_client.go b/client/extension_client.go
index e94a8d2..c178feb 100644
--- a/client/extension_client.go
+++ b/client/extension_client.go
@@ -35,3 +35,13 @@ func (c *APIClient) PrepareRequest(
 func (c *APIClient) CallAPI(request *http.Request) (*http.Response, error) {
 	return c.callAPI(request)
 }
+
+// wrapParameterAddToHeader wraps wrapParameterAddToHeaderOrQuery to avoid future breaking changes.
+func wrapParameterAddToHeader(headerOrQueryParams interface{}, keyPrefix string, obj interface{}, collectionType string) {
+	parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, obj, "simple", collectionType)
+}
+
+// wrapParameterAddToQuery wraps wrapParameterAddToHeaderOrQuery to avoid future breaking changes.
+func wrapParameterAddToQuery(headerOrQueryParams interface{}, keyPrefix string, obj interface{}, collectionType string) {
+	parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, obj, "form", collectionType)
+}
diff --git a/client/extension_generic_workjobs_link.go b/client/extension_generic_workjobs_link.go
index 1f6492a..0b05b93 100644
--- a/client/extension_generic_workjobs_link.go
+++ b/client/extension_generic_workjobs_link.go
@@ -46,13 +46,13 @@ func (a *GenericWorkJobsAPIService) FollowGenericWorkJobLink(r *ApiListGenericWo
 	localVarFormParams := url.Values{}
 
 	if r.embed != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "embed", r.embed, "")
+		wrapParameterAddToQuery(localVarQueryParams, "embed", r.embed, "")
 	}
 	if r.limit != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "")
+		wrapParameterAddToQuery(localVarQueryParams, "limit", r.limit, "")
 	}
 	if r.offset != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "")
+		wrapParameterAddToQuery(localVarQueryParams, "offset", r.offset, "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -72,10 +72,10 @@ func (a *GenericWorkJobsAPIService) FollowGenericWorkJobLink(r *ApiListGenericWo
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
 	if r.acceptVersion != nil {
-		parameterAddToHeaderOrQuery(localVarHeaderParams, "Accept-Version", r.acceptVersion, "")
+		wrapParameterAddToHeader(localVarHeaderParams, "Accept-Version", r.acceptVersion, "")
 	}
 	if r.ifNoneMatch != nil {
-		parameterAddToHeaderOrQuery(localVarHeaderParams, "if-none-match", r.ifNoneMatch, "")
+		wrapParameterAddToHeader(localVarHeaderParams, "if-none-match", r.ifNoneMatch, "")
 	}
 	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
 	if err != nil {
diff --git a/client/extension_messages_link.go b/client/extension_messages_link.go
index d71860b..fcee24a 100644
--- a/client/extension_messages_link.go
+++ b/client/extension_messages_link.go
@@ -47,10 +47,10 @@ func (a *BuildJobsAPIService) FollowMessageLink(r *ApiGetBuildMessagesRequest, l
 	localVarFormParams := url.Values{}
 
 	if r.limit != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "")
+		wrapParameterAddToQuery(localVarQueryParams, "limit", r.limit, "")
 	}
 	if r.offset != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "")
+		wrapParameterAddToQuery(localVarQueryParams, "offset", r.offset, "")
 	}
 	// to determine the Content-Type header
 	var localVarHTTPContentTypes []string
@@ -70,10 +70,10 @@ func (a *BuildJobsAPIService) FollowMessageLink(r *ApiGetBuildMessagesRequest, l
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
 	if r.acceptVersion != nil {
-		parameterAddToHeaderOrQuery(localVarHeaderParams, "Accept-Version", r.acceptVersion, "")
+		wrapParameterAddToHeader(localVarHeaderParams, "Accept-Version", r.acceptVersion, "")
 	}
 	if r.ifNoneMatch != nil {
-		parameterAddToHeaderOrQuery(localVarHeaderParams, "if-none-match", r.ifNoneMatch, "")
+		wrapParameterAddToHeader(localVarHeaderParams, "if-none-match", r.ifNoneMatch, "")
 	}
 	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
 	if err != nil {
@@ -195,10 +195,10 @@ func (a *VHTRunJobsAPIService) FollowMessageLink(r *ApiGetVhtRunJobMessagesReque
 	localVarFormParams := url.Values{}
 
 	if r.limit != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "")
+		wrapParameterAddToQuery(localVarQueryParams, "limit", r.limit, "")
 	}
 	if r.offset != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "")
+		wrapParameterAddToQuery(localVarQueryParams, "offset", r.offset, "")
 	}
 	// to determine the Content-Type header
 	var localVarHTTPContentTypes []string
@@ -218,10 +218,10 @@ func (a *VHTRunJobsAPIService) FollowMessageLink(r *ApiGetVhtRunJobMessagesReque
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
 	if r.acceptVersion != nil {
-		parameterAddToHeaderOrQuery(localVarHeaderParams, "Accept-Version", r.acceptVersion, "")
+		wrapParameterAddToHeader(localVarHeaderParams, "Accept-Version", r.acceptVersion, "")
 	}
 	if r.ifNoneMatch != nil {
-		parameterAddToHeaderOrQuery(localVarHeaderParams, "if-none-match", r.ifNoneMatch, "")
+		wrapParameterAddToHeader(localVarHeaderParams, "if-none-match", r.ifNoneMatch, "")
 	}
 	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
 	if err != nil {
@@ -343,10 +343,10 @@ func (a *GenericWorkJobsAPIService) FollowMessageLink(r *ApiGetGenericWorkJobMes
 	localVarFormParams := url.Values{}
 
 	if r.limit != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "")
+		wrapParameterAddToQuery(localVarQueryParams, "limit", r.limit, "")
 	}
 	if r.offset != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "")
+		wrapParameterAddToQuery(localVarQueryParams, "offset", r.offset, "")
 	}
 	// to determine the Content-Type header
 	var localVarHTTPContentTypes []string
@@ -366,10 +366,10 @@ func (a *GenericWorkJobsAPIService) FollowMessageLink(r *ApiGetGenericWorkJobMes
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
 	if r.acceptVersion != nil {
-		parameterAddToHeaderOrQuery(localVarHeaderParams, "Accept-Version", r.acceptVersion, "")
+		wrapParameterAddToHeader(localVarHeaderParams, "Accept-Version", r.acceptVersion, "")
 	}
 	if r.ifNoneMatch != nil {
-		parameterAddToHeaderOrQuery(localVarHeaderParams, "if-none-match", r.ifNoneMatch, "")
+		wrapParameterAddToHeader(localVarHeaderParams, "if-none-match", r.ifNoneMatch, "")
 	}
 	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
 	if err != nil {
diff --git a/client/extension_virtual_hardware_targets_link.go b/client/extension_virtual_hardware_targets_link.go
index 136ab7e..b089503 100644
--- a/client/extension_virtual_hardware_targets_link.go
+++ b/client/extension_virtual_hardware_targets_link.go
@@ -46,13 +46,13 @@ func (a *VirtualHardwareTargetAPIService) FollowVirtualHardwareTargetsLink(r *Ap
 	localVarFormParams := url.Values{}
 
 	if r.embed != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "embed", r.embed, "")
+		wrapParameterAddToQuery(localVarQueryParams, "embed", r.embed, "")
 	}
 	if r.limit != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "")
+		wrapParameterAddToQuery(localVarQueryParams, "limit", r.limit, "")
 	}
 	if r.offset != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "")
+		wrapParameterAddToQuery(localVarQueryParams, "offset", r.offset, "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -72,10 +72,10 @@ func (a *VirtualHardwareTargetAPIService) FollowVirtualHardwareTargetsLink(r *Ap
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
 	if r.acceptVersion != nil {
-		parameterAddToHeaderOrQuery(localVarHeaderParams, "Accept-Version", r.acceptVersion, "")
+		wrapParameterAddToHeader(localVarHeaderParams, "Accept-Version", r.acceptVersion, "")
 	}
 	if r.ifNoneMatch != nil {
-		parameterAddToHeaderOrQuery(localVarHeaderParams, "if-none-match", r.ifNoneMatch, "")
+		wrapParameterAddToHeader(localVarHeaderParams, "if-none-match", r.ifNoneMatch, "")
 	}
 	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
 	if err != nil {
diff --git a/client/extension_workspaces_link.go b/client/extension_workspaces_link.go
index c5061ef..4b9a965 100644
--- a/client/extension_workspaces_link.go
+++ b/client/extension_workspaces_link.go
@@ -46,13 +46,13 @@ func (a *WorkspaceAPIService) FollowWorkspaceLink(r *ApiListWorkspacesRequest, l
 	localVarFormParams := url.Values{}
 
 	if r.embed != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "embed", r.embed, "")
+		wrapParameterAddToQuery(localVarQueryParams, "embed", r.embed, "")
 	}
 	if r.limit != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "")
+		wrapParameterAddToQuery(localVarQueryParams, "limit", r.limit, "")
 	}
 	if r.offset != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "")
+		wrapParameterAddToQuery(localVarQueryParams, "offset", r.offset, "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -72,10 +72,10 @@ func (a *WorkspaceAPIService) FollowWorkspaceLink(r *ApiListWorkspacesRequest, l
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
 	if r.acceptVersion != nil {
-		parameterAddToHeaderOrQuery(localVarHeaderParams, "Accept-Version", r.acceptVersion, "")
+		wrapParameterAddToHeader(localVarHeaderParams, "Accept-Version", r.acceptVersion, "")
 	}
 	if r.ifNoneMatch != nil {
-		parameterAddToHeaderOrQuery(localVarHeaderParams, "if-none-match", r.ifNoneMatch, "")
+		wrapParameterAddToHeader(localVarHeaderParams, "if-none-match", r.ifNoneMatch, "")
 	}
 	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
 	if err != nil {
diff --git a/extensions/extension_builders_link.go b/extensions/extension_builders_link.go
index fda4939..8b5f3a4 100644
--- a/extensions/extension_builders_link.go
+++ b/extensions/extension_builders_link.go
@@ -46,13 +46,13 @@ func (a *CMSISBuildersAPIService) FollowBuildersLink(r *ApiListCmsisBuildersRequ
 	localVarFormParams := url.Values{}
 
 	if r.embed != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "embed", r.embed, "")
+		wrapParameterAddToQuery(localVarQueryParams, "embed", r.embed, "")
 	}
 	if r.limit != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "")
+		wrapParameterAddToQuery(localVarQueryParams, "limit", r.limit, "")
 	}
 	if r.offset != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "")
+		wrapParameterAddToQuery(localVarQueryParams, "offset", r.offset, "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -72,10 +72,10 @@ func (a *CMSISBuildersAPIService) FollowBuildersLink(r *ApiListCmsisBuildersRequ
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
 	if r.acceptVersion != nil {
-		parameterAddToHeaderOrQuery(localVarHeaderParams, "Accept-Version", r.acceptVersion, "")
+		wrapParameterAddToHeader(localVarHeaderParams, "Accept-Version", r.acceptVersion, "")
 	}
 	if r.ifNoneMatch != nil {
-		parameterAddToHeaderOrQuery(localVarHeaderParams, "if-none-match", r.ifNoneMatch, "")
+		wrapParameterAddToHeader(localVarHeaderParams, "if-none-match", r.ifNoneMatch, "")
 	}
 	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
 	if err != nil {
diff --git a/extensions/extension_buildjobs_link.go b/extensions/extension_buildjobs_link.go
index cde05be..f7bbe8f 100644
--- a/extensions/extension_buildjobs_link.go
+++ b/extensions/extension_buildjobs_link.go
@@ -46,13 +46,13 @@ func (a *BuildJobsAPIService) FollowBuildJobLink(r *ApiListBuildJobRequest, link
 	localVarFormParams := url.Values{}
 
 	if r.embed != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "embed", r.embed, "")
+		wrapParameterAddToQuery(localVarQueryParams, "embed", r.embed, "")
 	}
 	if r.limit != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "")
+		wrapParameterAddToQuery(localVarQueryParams, "limit", r.limit, "")
 	}
 	if r.offset != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "")
+		wrapParameterAddToQuery(localVarQueryParams, "offset", r.offset, "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -72,10 +72,10 @@ func (a *BuildJobsAPIService) FollowBuildJobLink(r *ApiListBuildJobRequest, link
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
 	if r.acceptVersion != nil {
-		parameterAddToHeaderOrQuery(localVarHeaderParams, "Accept-Version", r.acceptVersion, "")
+		wrapParameterAddToHeader(localVarHeaderParams, "Accept-Version", r.acceptVersion, "")
 	}
 	if r.ifNoneMatch != nil {
-		parameterAddToHeaderOrQuery(localVarHeaderParams, "if-none-match", r.ifNoneMatch, "")
+		wrapParameterAddToHeader(localVarHeaderParams, "if-none-match", r.ifNoneMatch, "")
 	}
 	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
 	if err != nil {
diff --git a/extensions/extension_client.go b/extensions/extension_client.go
index e94a8d2..c178feb 100644
--- a/extensions/extension_client.go
+++ b/extensions/extension_client.go
@@ -35,3 +35,13 @@ func (c *APIClient) PrepareRequest(
 func (c *APIClient) CallAPI(request *http.Request) (*http.Response, error) {
 	return c.callAPI(request)
 }
+
+// wrapParameterAddToHeader wraps wrapParameterAddToHeaderOrQuery to avoid future breaking changes.
+func wrapParameterAddToHeader(headerOrQueryParams interface{}, keyPrefix string, obj interface{}, collectionType string) {
+	parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, obj, "simple", collectionType)
+}
+
+// wrapParameterAddToQuery wraps wrapParameterAddToHeaderOrQuery to avoid future breaking changes.
+func wrapParameterAddToQuery(headerOrQueryParams interface{}, keyPrefix string, obj interface{}, collectionType string) {
+	parameterAddToHeaderOrQuery(headerOrQueryParams, keyPrefix, obj, "form", collectionType)
+}
diff --git a/extensions/extension_generic_workjobs_link.go b/extensions/extension_generic_workjobs_link.go
index 1f6492a..0b05b93 100644
--- a/extensions/extension_generic_workjobs_link.go
+++ b/extensions/extension_generic_workjobs_link.go
@@ -46,13 +46,13 @@ func (a *GenericWorkJobsAPIService) FollowGenericWorkJobLink(r *ApiListGenericWo
 	localVarFormParams := url.Values{}
 
 	if r.embed != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "embed", r.embed, "")
+		wrapParameterAddToQuery(localVarQueryParams, "embed", r.embed, "")
 	}
 	if r.limit != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "")
+		wrapParameterAddToQuery(localVarQueryParams, "limit", r.limit, "")
 	}
 	if r.offset != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "")
+		wrapParameterAddToQuery(localVarQueryParams, "offset", r.offset, "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -72,10 +72,10 @@ func (a *GenericWorkJobsAPIService) FollowGenericWorkJobLink(r *ApiListGenericWo
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
 	if r.acceptVersion != nil {
-		parameterAddToHeaderOrQuery(localVarHeaderParams, "Accept-Version", r.acceptVersion, "")
+		wrapParameterAddToHeader(localVarHeaderParams, "Accept-Version", r.acceptVersion, "")
 	}
 	if r.ifNoneMatch != nil {
-		parameterAddToHeaderOrQuery(localVarHeaderParams, "if-none-match", r.ifNoneMatch, "")
+		wrapParameterAddToHeader(localVarHeaderParams, "if-none-match", r.ifNoneMatch, "")
 	}
 	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
 	if err != nil {
diff --git a/extensions/extension_messages_link.go b/extensions/extension_messages_link.go
index d71860b..fcee24a 100644
--- a/extensions/extension_messages_link.go
+++ b/extensions/extension_messages_link.go
@@ -47,10 +47,10 @@ func (a *BuildJobsAPIService) FollowMessageLink(r *ApiGetBuildMessagesRequest, l
 	localVarFormParams := url.Values{}
 
 	if r.limit != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "")
+		wrapParameterAddToQuery(localVarQueryParams, "limit", r.limit, "")
 	}
 	if r.offset != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "")
+		wrapParameterAddToQuery(localVarQueryParams, "offset", r.offset, "")
 	}
 	// to determine the Content-Type header
 	var localVarHTTPContentTypes []string
@@ -70,10 +70,10 @@ func (a *BuildJobsAPIService) FollowMessageLink(r *ApiGetBuildMessagesRequest, l
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
 	if r.acceptVersion != nil {
-		parameterAddToHeaderOrQuery(localVarHeaderParams, "Accept-Version", r.acceptVersion, "")
+		wrapParameterAddToHeader(localVarHeaderParams, "Accept-Version", r.acceptVersion, "")
 	}
 	if r.ifNoneMatch != nil {
-		parameterAddToHeaderOrQuery(localVarHeaderParams, "if-none-match", r.ifNoneMatch, "")
+		wrapParameterAddToHeader(localVarHeaderParams, "if-none-match", r.ifNoneMatch, "")
 	}
 	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
 	if err != nil {
@@ -195,10 +195,10 @@ func (a *VHTRunJobsAPIService) FollowMessageLink(r *ApiGetVhtRunJobMessagesReque
 	localVarFormParams := url.Values{}
 
 	if r.limit != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "")
+		wrapParameterAddToQuery(localVarQueryParams, "limit", r.limit, "")
 	}
 	if r.offset != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "")
+		wrapParameterAddToQuery(localVarQueryParams, "offset", r.offset, "")
 	}
 	// to determine the Content-Type header
 	var localVarHTTPContentTypes []string
@@ -218,10 +218,10 @@ func (a *VHTRunJobsAPIService) FollowMessageLink(r *ApiGetVhtRunJobMessagesReque
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
 	if r.acceptVersion != nil {
-		parameterAddToHeaderOrQuery(localVarHeaderParams, "Accept-Version", r.acceptVersion, "")
+		wrapParameterAddToHeader(localVarHeaderParams, "Accept-Version", r.acceptVersion, "")
 	}
 	if r.ifNoneMatch != nil {
-		parameterAddToHeaderOrQuery(localVarHeaderParams, "if-none-match", r.ifNoneMatch, "")
+		wrapParameterAddToHeader(localVarHeaderParams, "if-none-match", r.ifNoneMatch, "")
 	}
 	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
 	if err != nil {
@@ -343,10 +343,10 @@ func (a *GenericWorkJobsAPIService) FollowMessageLink(r *ApiGetGenericWorkJobMes
 	localVarFormParams := url.Values{}
 
 	if r.limit != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "")
+		wrapParameterAddToQuery(localVarQueryParams, "limit", r.limit, "")
 	}
 	if r.offset != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "")
+		wrapParameterAddToQuery(localVarQueryParams, "offset", r.offset, "")
 	}
 	// to determine the Content-Type header
 	var localVarHTTPContentTypes []string
@@ -366,10 +366,10 @@ func (a *GenericWorkJobsAPIService) FollowMessageLink(r *ApiGetGenericWorkJobMes
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
 	if r.acceptVersion != nil {
-		parameterAddToHeaderOrQuery(localVarHeaderParams, "Accept-Version", r.acceptVersion, "")
+		wrapParameterAddToHeader(localVarHeaderParams, "Accept-Version", r.acceptVersion, "")
 	}
 	if r.ifNoneMatch != nil {
-		parameterAddToHeaderOrQuery(localVarHeaderParams, "if-none-match", r.ifNoneMatch, "")
+		wrapParameterAddToHeader(localVarHeaderParams, "if-none-match", r.ifNoneMatch, "")
 	}
 	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
 	if err != nil {
diff --git a/extensions/extension_virtual_hardware_targets_link.go b/extensions/extension_virtual_hardware_targets_link.go
index 136ab7e..b089503 100644
--- a/extensions/extension_virtual_hardware_targets_link.go
+++ b/extensions/extension_virtual_hardware_targets_link.go
@@ -46,13 +46,13 @@ func (a *VirtualHardwareTargetAPIService) FollowVirtualHardwareTargetsLink(r *Ap
 	localVarFormParams := url.Values{}
 
 	if r.embed != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "embed", r.embed, "")
+		wrapParameterAddToQuery(localVarQueryParams, "embed", r.embed, "")
 	}
 	if r.limit != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "")
+		wrapParameterAddToQuery(localVarQueryParams, "limit", r.limit, "")
 	}
 	if r.offset != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "")
+		wrapParameterAddToQuery(localVarQueryParams, "offset", r.offset, "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -72,10 +72,10 @@ func (a *VirtualHardwareTargetAPIService) FollowVirtualHardwareTargetsLink(r *Ap
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
 	if r.acceptVersion != nil {
-		parameterAddToHeaderOrQuery(localVarHeaderParams, "Accept-Version", r.acceptVersion, "")
+		wrapParameterAddToHeader(localVarHeaderParams, "Accept-Version", r.acceptVersion, "")
 	}
 	if r.ifNoneMatch != nil {
-		parameterAddToHeaderOrQuery(localVarHeaderParams, "if-none-match", r.ifNoneMatch, "")
+		wrapParameterAddToHeader(localVarHeaderParams, "if-none-match", r.ifNoneMatch, "")
 	}
 	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
 	if err != nil {
diff --git a/extensions/extension_workspaces_link.go b/extensions/extension_workspaces_link.go
index c5061ef..4b9a965 100644
--- a/extensions/extension_workspaces_link.go
+++ b/extensions/extension_workspaces_link.go
@@ -46,13 +46,13 @@ func (a *WorkspaceAPIService) FollowWorkspaceLink(r *ApiListWorkspacesRequest, l
 	localVarFormParams := url.Values{}
 
 	if r.embed != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "embed", r.embed, "")
+		wrapParameterAddToQuery(localVarQueryParams, "embed", r.embed, "")
 	}
 	if r.limit != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "limit", r.limit, "")
+		wrapParameterAddToQuery(localVarQueryParams, "limit", r.limit, "")
 	}
 	if r.offset != nil {
-		parameterAddToHeaderOrQuery(localVarQueryParams, "offset", r.offset, "")
+		wrapParameterAddToQuery(localVarQueryParams, "offset", r.offset, "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -72,10 +72,10 @@ func (a *WorkspaceAPIService) FollowWorkspaceLink(r *ApiListWorkspacesRequest, l
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
 	if r.acceptVersion != nil {
-		parameterAddToHeaderOrQuery(localVarHeaderParams, "Accept-Version", r.acceptVersion, "")
+		wrapParameterAddToHeader(localVarHeaderParams, "Accept-Version", r.acceptVersion, "")
 	}
 	if r.ifNoneMatch != nil {
-		parameterAddToHeaderOrQuery(localVarHeaderParams, "if-none-match", r.ifNoneMatch, "")
+		wrapParameterAddToHeader(localVarHeaderParams, "if-none-match", r.ifNoneMatch, "")
 	}
 	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
 	if err != nil {