diff --git a/cmd/libs/go2idl/client-gen/generators/generator-for-type.go b/cmd/libs/go2idl/client-gen/generators/generator-for-type.go
index e0e9cac6cf..4cac5b94a0 100644
--- a/cmd/libs/go2idl/client-gen/generators/generator-for-type.go
+++ b/cmd/libs/go2idl/client-gen/generators/generator-for-type.go
@@ -158,7 +158,7 @@ var deleteCollectionTemplate = `
 // DeleteCollection deletes a collection of objects.
 func (c *$.type|privatePlural$) DeleteCollection(options *$.apiDeleteOptions|raw$, listOptions $.apiListOptions|raw$) error {
 	return c.client.Delete().
-		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Namespace(c.ns).
 		Resource("$.type|privatePlural$").
 		VersionedParams(&listOptions, api.Scheme).
 		Body(options).
diff --git a/cmd/libs/go2idl/client-gen/testoutput/testgroup/unversioned/testtype.go b/cmd/libs/go2idl/client-gen/testoutput/testgroup/unversioned/testtype.go
index aa928f74eb..8928cb5dc8 100644
--- a/cmd/libs/go2idl/client-gen/testoutput/testgroup/unversioned/testtype.go
+++ b/cmd/libs/go2idl/client-gen/testoutput/testgroup/unversioned/testtype.go
@@ -91,7 +91,7 @@ func (c *testTypes) Delete(name string, options *api.DeleteOptions) error {
 // DeleteCollection deletes a collection of objects.
 func (c *testTypes) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
 	return c.client.Delete().
-		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Namespace(c.ns).
 		Resource("testTypes").
 		VersionedParams(&listOptions, api.Scheme).
 		Body(options).
diff --git a/pkg/client/typed/generated/extensions/unversioned/daemonset.go b/pkg/client/typed/generated/extensions/unversioned/daemonset.go
index 75c00b428d..b47c5e8220 100644
--- a/pkg/client/typed/generated/extensions/unversioned/daemonset.go
+++ b/pkg/client/typed/generated/extensions/unversioned/daemonset.go
@@ -91,7 +91,7 @@ func (c *daemonSets) Delete(name string, options *api.DeleteOptions) error {
 // DeleteCollection deletes a collection of objects.
 func (c *daemonSets) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
 	return c.client.Delete().
-		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Namespace(c.ns).
 		Resource("daemonSets").
 		VersionedParams(&listOptions, api.Scheme).
 		Body(options).
diff --git a/pkg/client/typed/generated/extensions/unversioned/deployment.go b/pkg/client/typed/generated/extensions/unversioned/deployment.go
index fba338a68a..29a6c8b126 100644
--- a/pkg/client/typed/generated/extensions/unversioned/deployment.go
+++ b/pkg/client/typed/generated/extensions/unversioned/deployment.go
@@ -91,7 +91,7 @@ func (c *deployments) Delete(name string, options *api.DeleteOptions) error {
 // DeleteCollection deletes a collection of objects.
 func (c *deployments) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
 	return c.client.Delete().
-		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Namespace(c.ns).
 		Resource("deployments").
 		VersionedParams(&listOptions, api.Scheme).
 		Body(options).
diff --git a/pkg/client/typed/generated/extensions/unversioned/horizontalpodautoscaler.go b/pkg/client/typed/generated/extensions/unversioned/horizontalpodautoscaler.go
index 32fee681a6..58a78fcde6 100644
--- a/pkg/client/typed/generated/extensions/unversioned/horizontalpodautoscaler.go
+++ b/pkg/client/typed/generated/extensions/unversioned/horizontalpodautoscaler.go
@@ -91,7 +91,7 @@ func (c *horizontalPodAutoscalers) Delete(name string, options *api.DeleteOption
 // DeleteCollection deletes a collection of objects.
 func (c *horizontalPodAutoscalers) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
 	return c.client.Delete().
-		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Namespace(c.ns).
 		Resource("horizontalPodAutoscalers").
 		VersionedParams(&listOptions, api.Scheme).
 		Body(options).
diff --git a/pkg/client/typed/generated/extensions/unversioned/ingress.go b/pkg/client/typed/generated/extensions/unversioned/ingress.go
index fb685fc13e..da621adbcd 100644
--- a/pkg/client/typed/generated/extensions/unversioned/ingress.go
+++ b/pkg/client/typed/generated/extensions/unversioned/ingress.go
@@ -91,7 +91,7 @@ func (c *ingresses) Delete(name string, options *api.DeleteOptions) error {
 // DeleteCollection deletes a collection of objects.
 func (c *ingresses) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
 	return c.client.Delete().
-		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Namespace(c.ns).
 		Resource("ingresses").
 		VersionedParams(&listOptions, api.Scheme).
 		Body(options).
diff --git a/pkg/client/typed/generated/extensions/unversioned/job.go b/pkg/client/typed/generated/extensions/unversioned/job.go
index 9290aa1724..d1ec02ad8b 100644
--- a/pkg/client/typed/generated/extensions/unversioned/job.go
+++ b/pkg/client/typed/generated/extensions/unversioned/job.go
@@ -91,7 +91,7 @@ func (c *jobs) Delete(name string, options *api.DeleteOptions) error {
 // DeleteCollection deletes a collection of objects.
 func (c *jobs) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
 	return c.client.Delete().
-		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Namespace(c.ns).
 		Resource("jobs").
 		VersionedParams(&listOptions, api.Scheme).
 		Body(options).
diff --git a/pkg/client/typed/generated/extensions/unversioned/thirdpartyresource.go b/pkg/client/typed/generated/extensions/unversioned/thirdpartyresource.go
index cfe776af2d..b98ead3991 100644
--- a/pkg/client/typed/generated/extensions/unversioned/thirdpartyresource.go
+++ b/pkg/client/typed/generated/extensions/unversioned/thirdpartyresource.go
@@ -91,7 +91,7 @@ func (c *thirdPartyResources) Delete(name string, options *api.DeleteOptions) er
 // DeleteCollection deletes a collection of objects.
 func (c *thirdPartyResources) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
 	return c.client.Delete().
-		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Namespace(c.ns).
 		Resource("thirdPartyResources").
 		VersionedParams(&listOptions, api.Scheme).
 		Body(options).
diff --git a/pkg/client/typed/generated/legacy/unversioned/componentstatus.go b/pkg/client/typed/generated/legacy/unversioned/componentstatus.go
index ba6396c27b..9bec359d3f 100644
--- a/pkg/client/typed/generated/legacy/unversioned/componentstatus.go
+++ b/pkg/client/typed/generated/legacy/unversioned/componentstatus.go
@@ -90,7 +90,7 @@ func (c *componentStatus) Delete(name string, options *api.DeleteOptions) error
 // DeleteCollection deletes a collection of objects.
 func (c *componentStatus) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
 	return c.client.Delete().
-		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Namespace(c.ns).
 		Resource("componentStatus").
 		VersionedParams(&listOptions, api.Scheme).
 		Body(options).
diff --git a/pkg/client/typed/generated/legacy/unversioned/endpoints.go b/pkg/client/typed/generated/legacy/unversioned/endpoints.go
index 9a132f0677..7f6bc7846b 100644
--- a/pkg/client/typed/generated/legacy/unversioned/endpoints.go
+++ b/pkg/client/typed/generated/legacy/unversioned/endpoints.go
@@ -90,7 +90,7 @@ func (c *endpoints) Delete(name string, options *api.DeleteOptions) error {
 // DeleteCollection deletes a collection of objects.
 func (c *endpoints) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
 	return c.client.Delete().
-		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Namespace(c.ns).
 		Resource("endpoints").
 		VersionedParams(&listOptions, api.Scheme).
 		Body(options).
diff --git a/pkg/client/typed/generated/legacy/unversioned/event.go b/pkg/client/typed/generated/legacy/unversioned/event.go
index d092362cd5..5f4692ad51 100644
--- a/pkg/client/typed/generated/legacy/unversioned/event.go
+++ b/pkg/client/typed/generated/legacy/unversioned/event.go
@@ -90,7 +90,7 @@ func (c *events) Delete(name string, options *api.DeleteOptions) error {
 // DeleteCollection deletes a collection of objects.
 func (c *events) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
 	return c.client.Delete().
-		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Namespace(c.ns).
 		Resource("events").
 		VersionedParams(&listOptions, api.Scheme).
 		Body(options).
diff --git a/pkg/client/typed/generated/legacy/unversioned/limitrange.go b/pkg/client/typed/generated/legacy/unversioned/limitrange.go
index d12546c887..708ccd67ad 100644
--- a/pkg/client/typed/generated/legacy/unversioned/limitrange.go
+++ b/pkg/client/typed/generated/legacy/unversioned/limitrange.go
@@ -90,7 +90,7 @@ func (c *limitRanges) Delete(name string, options *api.DeleteOptions) error {
 // DeleteCollection deletes a collection of objects.
 func (c *limitRanges) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
 	return c.client.Delete().
-		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Namespace(c.ns).
 		Resource("limitRanges").
 		VersionedParams(&listOptions, api.Scheme).
 		Body(options).
diff --git a/pkg/client/typed/generated/legacy/unversioned/namespace.go b/pkg/client/typed/generated/legacy/unversioned/namespace.go
index cd06f09988..163ceef4be 100644
--- a/pkg/client/typed/generated/legacy/unversioned/namespace.go
+++ b/pkg/client/typed/generated/legacy/unversioned/namespace.go
@@ -90,7 +90,7 @@ func (c *namespaces) Delete(name string, options *api.DeleteOptions) error {
 // DeleteCollection deletes a collection of objects.
 func (c *namespaces) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
 	return c.client.Delete().
-		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Namespace(c.ns).
 		Resource("namespaces").
 		VersionedParams(&listOptions, api.Scheme).
 		Body(options).
diff --git a/pkg/client/typed/generated/legacy/unversioned/node.go b/pkg/client/typed/generated/legacy/unversioned/node.go
index 5b93edb9b1..33463e2a0a 100644
--- a/pkg/client/typed/generated/legacy/unversioned/node.go
+++ b/pkg/client/typed/generated/legacy/unversioned/node.go
@@ -90,7 +90,7 @@ func (c *nodes) Delete(name string, options *api.DeleteOptions) error {
 // DeleteCollection deletes a collection of objects.
 func (c *nodes) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
 	return c.client.Delete().
-		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Namespace(c.ns).
 		Resource("nodes").
 		VersionedParams(&listOptions, api.Scheme).
 		Body(options).
diff --git a/pkg/client/typed/generated/legacy/unversioned/persistentvolume.go b/pkg/client/typed/generated/legacy/unversioned/persistentvolume.go
index 4c2fb3916e..7db90687b7 100644
--- a/pkg/client/typed/generated/legacy/unversioned/persistentvolume.go
+++ b/pkg/client/typed/generated/legacy/unversioned/persistentvolume.go
@@ -90,7 +90,7 @@ func (c *persistentVolumes) Delete(name string, options *api.DeleteOptions) erro
 // DeleteCollection deletes a collection of objects.
 func (c *persistentVolumes) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
 	return c.client.Delete().
-		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Namespace(c.ns).
 		Resource("persistentVolumes").
 		VersionedParams(&listOptions, api.Scheme).
 		Body(options).
diff --git a/pkg/client/typed/generated/legacy/unversioned/persistentvolumeclaim.go b/pkg/client/typed/generated/legacy/unversioned/persistentvolumeclaim.go
index 66f08bda09..7509c5b96b 100644
--- a/pkg/client/typed/generated/legacy/unversioned/persistentvolumeclaim.go
+++ b/pkg/client/typed/generated/legacy/unversioned/persistentvolumeclaim.go
@@ -90,7 +90,7 @@ func (c *persistentVolumeClaims) Delete(name string, options *api.DeleteOptions)
 // DeleteCollection deletes a collection of objects.
 func (c *persistentVolumeClaims) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
 	return c.client.Delete().
-		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Namespace(c.ns).
 		Resource("persistentVolumeClaims").
 		VersionedParams(&listOptions, api.Scheme).
 		Body(options).
diff --git a/pkg/client/typed/generated/legacy/unversioned/pod.go b/pkg/client/typed/generated/legacy/unversioned/pod.go
index 4ca35e66da..347a0fd34c 100644
--- a/pkg/client/typed/generated/legacy/unversioned/pod.go
+++ b/pkg/client/typed/generated/legacy/unversioned/pod.go
@@ -90,7 +90,7 @@ func (c *pods) Delete(name string, options *api.DeleteOptions) error {
 // DeleteCollection deletes a collection of objects.
 func (c *pods) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
 	return c.client.Delete().
-		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Namespace(c.ns).
 		Resource("pods").
 		VersionedParams(&listOptions, api.Scheme).
 		Body(options).
diff --git a/pkg/client/typed/generated/legacy/unversioned/podtemplate.go b/pkg/client/typed/generated/legacy/unversioned/podtemplate.go
index d2db58b0e3..8a172afb73 100644
--- a/pkg/client/typed/generated/legacy/unversioned/podtemplate.go
+++ b/pkg/client/typed/generated/legacy/unversioned/podtemplate.go
@@ -90,7 +90,7 @@ func (c *podTemplates) Delete(name string, options *api.DeleteOptions) error {
 // DeleteCollection deletes a collection of objects.
 func (c *podTemplates) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
 	return c.client.Delete().
-		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Namespace(c.ns).
 		Resource("podTemplates").
 		VersionedParams(&listOptions, api.Scheme).
 		Body(options).
diff --git a/pkg/client/typed/generated/legacy/unversioned/replicationcontroller.go b/pkg/client/typed/generated/legacy/unversioned/replicationcontroller.go
index 9b3fadb21c..fa23538fe5 100644
--- a/pkg/client/typed/generated/legacy/unversioned/replicationcontroller.go
+++ b/pkg/client/typed/generated/legacy/unversioned/replicationcontroller.go
@@ -90,7 +90,7 @@ func (c *replicationControllers) Delete(name string, options *api.DeleteOptions)
 // DeleteCollection deletes a collection of objects.
 func (c *replicationControllers) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
 	return c.client.Delete().
-		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Namespace(c.ns).
 		Resource("replicationControllers").
 		VersionedParams(&listOptions, api.Scheme).
 		Body(options).
diff --git a/pkg/client/typed/generated/legacy/unversioned/resourcequota.go b/pkg/client/typed/generated/legacy/unversioned/resourcequota.go
index 961af46fbc..c7c0e016df 100644
--- a/pkg/client/typed/generated/legacy/unversioned/resourcequota.go
+++ b/pkg/client/typed/generated/legacy/unversioned/resourcequota.go
@@ -90,7 +90,7 @@ func (c *resourceQuotas) Delete(name string, options *api.DeleteOptions) error {
 // DeleteCollection deletes a collection of objects.
 func (c *resourceQuotas) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
 	return c.client.Delete().
-		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Namespace(c.ns).
 		Resource("resourceQuotas").
 		VersionedParams(&listOptions, api.Scheme).
 		Body(options).
diff --git a/pkg/client/typed/generated/legacy/unversioned/secret.go b/pkg/client/typed/generated/legacy/unversioned/secret.go
index 9611313868..45305e35e5 100644
--- a/pkg/client/typed/generated/legacy/unversioned/secret.go
+++ b/pkg/client/typed/generated/legacy/unversioned/secret.go
@@ -90,7 +90,7 @@ func (c *secrets) Delete(name string, options *api.DeleteOptions) error {
 // DeleteCollection deletes a collection of objects.
 func (c *secrets) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
 	return c.client.Delete().
-		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Namespace(c.ns).
 		Resource("secrets").
 		VersionedParams(&listOptions, api.Scheme).
 		Body(options).
diff --git a/pkg/client/typed/generated/legacy/unversioned/service.go b/pkg/client/typed/generated/legacy/unversioned/service.go
index 9d14a9e3a6..c314e2a866 100644
--- a/pkg/client/typed/generated/legacy/unversioned/service.go
+++ b/pkg/client/typed/generated/legacy/unversioned/service.go
@@ -90,7 +90,7 @@ func (c *services) Delete(name string, options *api.DeleteOptions) error {
 // DeleteCollection deletes a collection of objects.
 func (c *services) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
 	return c.client.Delete().
-		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Namespace(c.ns).
 		Resource("services").
 		VersionedParams(&listOptions, api.Scheme).
 		Body(options).
diff --git a/pkg/client/typed/generated/legacy/unversioned/serviceaccount.go b/pkg/client/typed/generated/legacy/unversioned/serviceaccount.go
index c283cd1ef0..ae664a64a9 100644
--- a/pkg/client/typed/generated/legacy/unversioned/serviceaccount.go
+++ b/pkg/client/typed/generated/legacy/unversioned/serviceaccount.go
@@ -90,7 +90,7 @@ func (c *serviceAccounts) Delete(name string, options *api.DeleteOptions) error
 // DeleteCollection deletes a collection of objects.
 func (c *serviceAccounts) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
 	return c.client.Delete().
-		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Namespace(c.ns).
 		Resource("serviceAccounts").
 		VersionedParams(&listOptions, api.Scheme).
 		Body(options).