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 0ffc1bfaf7b..7a78f22ab5c 100644
--- a/cmd/libs/go2idl/client-gen/generators/generator-for-type.go
+++ b/cmd/libs/go2idl/client-gen/generators/generator-for-type.go
@@ -165,19 +165,19 @@ var deleteCollectionTemplate = `
 // DeleteCollection deletes a collection of objects.
 func (c *$.type|privatePlural$) DeleteCollection(options *$.apiDeleteOptions|raw$, listOptions $.apiListOptions|raw$) error {
 	if options == nil {
-		return c.Client.Delete().
-			NamespaceIfScoped(e.namespace, len(e.namespace) > 0).
+		return c.client.Delete().
+			NamespaceIfScoped(c.ns, len(c.ns) > 0).
 			Resource("$.type|privatePlural$").
 			VersionedParams(&listOptions, api.Scheme).
 			Do().
 			Error()
 	}
-	body, err := api.Scheme.EncodeToVersion(options, c.client.APIVersion())
+	body, err := api.Scheme.EncodeToVersion(options, c.client.APIVersion().String())
 	if err != nil {
 		return err
 	}
-	return c.Client.Delete().
-		NamespaceIfScoped(e.namespace, len(e.namespace) > 0).
+	return c.client.Delete().
+		NamespaceIfScoped(c.ns, len(c.ns) > 0).
 		Resource("$.type|privatePlural$").
 		VersionedParams(&listOptions, api.Scheme).
 		Body(body).
diff --git a/cmd/libs/go2idl/client-gen/testdata/apis/testgroup/register.go b/cmd/libs/go2idl/client-gen/testdata/apis/testgroup/register.go
index d9fdf1ca01f..ed66d6abc66 100644
--- a/cmd/libs/go2idl/client-gen/testdata/apis/testgroup/register.go
+++ b/cmd/libs/go2idl/client-gen/testdata/apis/testgroup/register.go
@@ -36,7 +36,7 @@ func addKnownTypes() {
 	)
 
 	api.Scheme.AddKnownTypes(SchemeGroupVersion,
-		&unversioned.ListOptions{})
+		&api.ListOptions{})
 }
 
 func (obj *TestType) GetObjectKind() unversioned.ObjectKind     { return &obj.TypeMeta }
diff --git a/cmd/libs/go2idl/client-gen/testdata/apis/testgroup/v1/register.go b/cmd/libs/go2idl/client-gen/testdata/apis/testgroup/v1/register.go
index 03143624393..6c6a70e907c 100644
--- a/cmd/libs/go2idl/client-gen/testdata/apis/testgroup/v1/register.go
+++ b/cmd/libs/go2idl/client-gen/testdata/apis/testgroup/v1/register.go
@@ -19,6 +19,7 @@ package v1
 import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/unversioned"
+	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/runtime"
 )
 
@@ -39,7 +40,7 @@ func addKnownTypes() {
 	)
 
 	api.Scheme.AddKnownTypes(SchemeGroupVersion,
-		&unversioned.ListOptions{})
+		&v1.ListOptions{})
 }
 
 func (obj *TestType) GetObjectKind() unversioned.ObjectKind     { return &obj.TypeMeta }
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 8e77c839557..23261b39324 100644
--- a/cmd/libs/go2idl/client-gen/testoutput/testgroup/unversioned/testType.go
+++ b/cmd/libs/go2idl/client-gen/testoutput/testgroup/unversioned/testType.go
@@ -19,7 +19,6 @@ package unversioned
 import (
 	testgroup "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup"
 	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	watch "k8s.io/kubernetes/pkg/watch"
 )
 
@@ -33,9 +32,10 @@ type TestTypeInterface interface {
 	Create(*testgroup.TestType) (*testgroup.TestType, error)
 	Update(*testgroup.TestType) (*testgroup.TestType, error)
 	Delete(name string, options *api.DeleteOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
 	Get(name string) (*testgroup.TestType, error)
-	List(opts unversioned.ListOptions) (*testgroup.TestTypeList, error)
-	Watch(opts unversioned.ListOptions) (watch.Interface, error)
+	List(opts api.ListOptions) (*testgroup.TestTypeList, error)
+	Watch(opts api.ListOptions) (watch.Interface, error)
 }
 
 // testTypes implements TestTypeInterface
@@ -95,6 +95,29 @@ func (c *testTypes) Delete(name string, options *api.DeleteOptions) error {
 		Error()
 }
 
+// DeleteCollection deletes a collection of objects.
+func (c *testTypes) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+	if options == nil {
+		return c.client.Delete().
+			NamespaceIfScoped(c.ns, len(c.ns) > 0).
+			Resource("testTypes").
+			VersionedParams(&listOptions, api.Scheme).
+			Do().
+			Error()
+	}
+	body, err := api.Scheme.EncodeToVersion(options, c.client.APIVersion().String())
+	if err != nil {
+		return err
+	}
+	return c.client.Delete().
+		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Resource("testTypes").
+		VersionedParams(&listOptions, api.Scheme).
+		Body(body).
+		Do().
+		Error()
+}
+
 // Get takes name of the testType, and returns the corresponding testType object, and an error if there is any.
 func (c *testTypes) Get(name string) (result *testgroup.TestType, err error) {
 	result = &testgroup.TestType{}
@@ -108,7 +131,7 @@ func (c *testTypes) Get(name string) (result *testgroup.TestType, err error) {
 }
 
 // List takes label and field selectors, and returns the list of TestTypes that match those selectors.
-func (c *testTypes) List(opts unversioned.ListOptions) (result *testgroup.TestTypeList, err error) {
+func (c *testTypes) List(opts api.ListOptions) (result *testgroup.TestTypeList, err error) {
 	result = &testgroup.TestTypeList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -120,7 +143,7 @@ func (c *testTypes) List(opts unversioned.ListOptions) (result *testgroup.TestTy
 }
 
 // Watch returns a watch.Interface that watches the requested testTypes.
-func (c *testTypes) Watch(opts unversioned.ListOptions) (watch.Interface, error) {
+func (c *testTypes) Watch(opts api.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/cmd/libs/go2idl/client-gen/testoutput/testgroup/unversioned/testgroup_test.go b/cmd/libs/go2idl/client-gen/testoutput/testgroup/unversioned/testgroup_test.go
index dc5a2398ccd..f5cf9f870c6 100644
--- a/cmd/libs/go2idl/client-gen/testoutput/testgroup/unversioned/testgroup_test.go
+++ b/cmd/libs/go2idl/client-gen/testoutput/testgroup/unversioned/testgroup_test.go
@@ -152,7 +152,7 @@ func TestListEmptyTestTypes(t *testing.T) {
 			Response: simple.Response{StatusCode: http.StatusOK, Body: &testgroup.TestTypeList{}},
 		},
 	}
-	podList, err := c.Setup(t).TestTypes(ns).List(unversioned.ListOptions{})
+	podList, err := c.Setup(t).TestTypes(ns).List(api.ListOptions{})
 	c.simpleClient.Validate(t, podList, err)
 }
 
@@ -177,7 +177,7 @@ func TestListTestTypes(t *testing.T) {
 			},
 		},
 	}
-	receivedTestTypeList, err := c.Setup(t).TestTypes(ns).List(unversioned.ListOptions{})
+	receivedTestTypeList, err := c.Setup(t).TestTypes(ns).List(api.ListOptions{})
 	c.simpleClient.Validate(t, receivedTestTypeList, err)
 }
 
@@ -210,7 +210,7 @@ func TestListTestTypesLabels(t *testing.T) {
 	c.Setup(t)
 	c.simpleClient.QueryValidator[labelSelectorQueryParamName] = simple.ValidateLabels
 	selector := labels.Set{"foo": "bar", "name": "baz"}.AsSelector()
-	options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}}
+	options := api.ListOptions{LabelSelector: selector}
 	receivedTestTypeList, err := c.TestTypes(ns).List(options)
 	c.simpleClient.Validate(t, receivedTestTypeList, err)
 }
diff --git a/pkg/client/typed/generated/extensions/unversioned/daemonSet.go b/pkg/client/typed/generated/extensions/unversioned/daemonSet.go
index 28a9ccc042e..6a4f5545ac4 100644
--- a/pkg/client/typed/generated/extensions/unversioned/daemonSet.go
+++ b/pkg/client/typed/generated/extensions/unversioned/daemonSet.go
@@ -18,7 +18,6 @@ package unversioned
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	extensions "k8s.io/kubernetes/pkg/apis/extensions"
 	watch "k8s.io/kubernetes/pkg/watch"
 )
@@ -33,9 +32,10 @@ type DaemonSetInterface interface {
 	Create(*extensions.DaemonSet) (*extensions.DaemonSet, error)
 	Update(*extensions.DaemonSet) (*extensions.DaemonSet, error)
 	Delete(name string, options *api.DeleteOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
 	Get(name string) (*extensions.DaemonSet, error)
-	List(opts unversioned.ListOptions) (*extensions.DaemonSetList, error)
-	Watch(opts unversioned.ListOptions) (watch.Interface, error)
+	List(opts api.ListOptions) (*extensions.DaemonSetList, error)
+	Watch(opts api.ListOptions) (watch.Interface, error)
 }
 
 // daemonSets implements DaemonSetInterface
@@ -95,6 +95,29 @@ func (c *daemonSets) Delete(name string, options *api.DeleteOptions) error {
 		Error()
 }
 
+// DeleteCollection deletes a collection of objects.
+func (c *daemonSets) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+	if options == nil {
+		return c.client.Delete().
+			NamespaceIfScoped(c.ns, len(c.ns) > 0).
+			Resource("daemonSets").
+			VersionedParams(&listOptions, api.Scheme).
+			Do().
+			Error()
+	}
+	body, err := api.Scheme.EncodeToVersion(options, c.client.APIVersion().String())
+	if err != nil {
+		return err
+	}
+	return c.client.Delete().
+		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Resource("daemonSets").
+		VersionedParams(&listOptions, api.Scheme).
+		Body(body).
+		Do().
+		Error()
+}
+
 // Get takes name of the daemonSet, and returns the corresponding daemonSet object, and an error if there is any.
 func (c *daemonSets) Get(name string) (result *extensions.DaemonSet, err error) {
 	result = &extensions.DaemonSet{}
@@ -108,7 +131,7 @@ func (c *daemonSets) Get(name string) (result *extensions.DaemonSet, err error)
 }
 
 // List takes label and field selectors, and returns the list of DaemonSets that match those selectors.
-func (c *daemonSets) List(opts unversioned.ListOptions) (result *extensions.DaemonSetList, err error) {
+func (c *daemonSets) List(opts api.ListOptions) (result *extensions.DaemonSetList, err error) {
 	result = &extensions.DaemonSetList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -120,7 +143,7 @@ func (c *daemonSets) List(opts unversioned.ListOptions) (result *extensions.Daem
 }
 
 // Watch returns a watch.Interface that watches the requested daemonSets.
-func (c *daemonSets) Watch(opts unversioned.ListOptions) (watch.Interface, error) {
+func (c *daemonSets) Watch(opts api.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/pkg/client/typed/generated/extensions/unversioned/deployment.go b/pkg/client/typed/generated/extensions/unversioned/deployment.go
index f5f67bd3caf..5d1b6cd67d2 100644
--- a/pkg/client/typed/generated/extensions/unversioned/deployment.go
+++ b/pkg/client/typed/generated/extensions/unversioned/deployment.go
@@ -18,7 +18,6 @@ package unversioned
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	extensions "k8s.io/kubernetes/pkg/apis/extensions"
 	watch "k8s.io/kubernetes/pkg/watch"
 )
@@ -33,9 +32,10 @@ type DeploymentInterface interface {
 	Create(*extensions.Deployment) (*extensions.Deployment, error)
 	Update(*extensions.Deployment) (*extensions.Deployment, error)
 	Delete(name string, options *api.DeleteOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
 	Get(name string) (*extensions.Deployment, error)
-	List(opts unversioned.ListOptions) (*extensions.DeploymentList, error)
-	Watch(opts unversioned.ListOptions) (watch.Interface, error)
+	List(opts api.ListOptions) (*extensions.DeploymentList, error)
+	Watch(opts api.ListOptions) (watch.Interface, error)
 }
 
 // deployments implements DeploymentInterface
@@ -95,6 +95,29 @@ func (c *deployments) Delete(name string, options *api.DeleteOptions) error {
 		Error()
 }
 
+// DeleteCollection deletes a collection of objects.
+func (c *deployments) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+	if options == nil {
+		return c.client.Delete().
+			NamespaceIfScoped(c.ns, len(c.ns) > 0).
+			Resource("deployments").
+			VersionedParams(&listOptions, api.Scheme).
+			Do().
+			Error()
+	}
+	body, err := api.Scheme.EncodeToVersion(options, c.client.APIVersion().String())
+	if err != nil {
+		return err
+	}
+	return c.client.Delete().
+		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Resource("deployments").
+		VersionedParams(&listOptions, api.Scheme).
+		Body(body).
+		Do().
+		Error()
+}
+
 // Get takes name of the deployment, and returns the corresponding deployment object, and an error if there is any.
 func (c *deployments) Get(name string) (result *extensions.Deployment, err error) {
 	result = &extensions.Deployment{}
@@ -108,7 +131,7 @@ func (c *deployments) Get(name string) (result *extensions.Deployment, err error
 }
 
 // List takes label and field selectors, and returns the list of Deployments that match those selectors.
-func (c *deployments) List(opts unversioned.ListOptions) (result *extensions.DeploymentList, err error) {
+func (c *deployments) List(opts api.ListOptions) (result *extensions.DeploymentList, err error) {
 	result = &extensions.DeploymentList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -120,7 +143,7 @@ func (c *deployments) List(opts unversioned.ListOptions) (result *extensions.Dep
 }
 
 // Watch returns a watch.Interface that watches the requested deployments.
-func (c *deployments) Watch(opts unversioned.ListOptions) (watch.Interface, error) {
+func (c *deployments) Watch(opts api.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/pkg/client/typed/generated/extensions/unversioned/horizontalPodAutoscaler.go b/pkg/client/typed/generated/extensions/unversioned/horizontalPodAutoscaler.go
index f462b413b0c..4e1cb0304b3 100644
--- a/pkg/client/typed/generated/extensions/unversioned/horizontalPodAutoscaler.go
+++ b/pkg/client/typed/generated/extensions/unversioned/horizontalPodAutoscaler.go
@@ -18,7 +18,6 @@ package unversioned
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	extensions "k8s.io/kubernetes/pkg/apis/extensions"
 	watch "k8s.io/kubernetes/pkg/watch"
 )
@@ -33,9 +32,10 @@ type HorizontalPodAutoscalerInterface interface {
 	Create(*extensions.HorizontalPodAutoscaler) (*extensions.HorizontalPodAutoscaler, error)
 	Update(*extensions.HorizontalPodAutoscaler) (*extensions.HorizontalPodAutoscaler, error)
 	Delete(name string, options *api.DeleteOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
 	Get(name string) (*extensions.HorizontalPodAutoscaler, error)
-	List(opts unversioned.ListOptions) (*extensions.HorizontalPodAutoscalerList, error)
-	Watch(opts unversioned.ListOptions) (watch.Interface, error)
+	List(opts api.ListOptions) (*extensions.HorizontalPodAutoscalerList, error)
+	Watch(opts api.ListOptions) (watch.Interface, error)
 }
 
 // horizontalPodAutoscalers implements HorizontalPodAutoscalerInterface
@@ -95,6 +95,29 @@ func (c *horizontalPodAutoscalers) Delete(name string, options *api.DeleteOption
 		Error()
 }
 
+// DeleteCollection deletes a collection of objects.
+func (c *horizontalPodAutoscalers) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+	if options == nil {
+		return c.client.Delete().
+			NamespaceIfScoped(c.ns, len(c.ns) > 0).
+			Resource("horizontalPodAutoscalers").
+			VersionedParams(&listOptions, api.Scheme).
+			Do().
+			Error()
+	}
+	body, err := api.Scheme.EncodeToVersion(options, c.client.APIVersion().String())
+	if err != nil {
+		return err
+	}
+	return c.client.Delete().
+		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Resource("horizontalPodAutoscalers").
+		VersionedParams(&listOptions, api.Scheme).
+		Body(body).
+		Do().
+		Error()
+}
+
 // Get takes name of the horizontalPodAutoscaler, and returns the corresponding horizontalPodAutoscaler object, and an error if there is any.
 func (c *horizontalPodAutoscalers) Get(name string) (result *extensions.HorizontalPodAutoscaler, err error) {
 	result = &extensions.HorizontalPodAutoscaler{}
@@ -108,7 +131,7 @@ func (c *horizontalPodAutoscalers) Get(name string) (result *extensions.Horizont
 }
 
 // List takes label and field selectors, and returns the list of HorizontalPodAutoscalers that match those selectors.
-func (c *horizontalPodAutoscalers) List(opts unversioned.ListOptions) (result *extensions.HorizontalPodAutoscalerList, err error) {
+func (c *horizontalPodAutoscalers) List(opts api.ListOptions) (result *extensions.HorizontalPodAutoscalerList, err error) {
 	result = &extensions.HorizontalPodAutoscalerList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -120,7 +143,7 @@ func (c *horizontalPodAutoscalers) List(opts unversioned.ListOptions) (result *e
 }
 
 // Watch returns a watch.Interface that watches the requested horizontalPodAutoscalers.
-func (c *horizontalPodAutoscalers) Watch(opts unversioned.ListOptions) (watch.Interface, error) {
+func (c *horizontalPodAutoscalers) Watch(opts api.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/pkg/client/typed/generated/extensions/unversioned/ingress.go b/pkg/client/typed/generated/extensions/unversioned/ingress.go
index c41d1075cbc..c7cebfaeb0e 100644
--- a/pkg/client/typed/generated/extensions/unversioned/ingress.go
+++ b/pkg/client/typed/generated/extensions/unversioned/ingress.go
@@ -18,7 +18,6 @@ package unversioned
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	extensions "k8s.io/kubernetes/pkg/apis/extensions"
 	watch "k8s.io/kubernetes/pkg/watch"
 )
@@ -33,9 +32,10 @@ type IngressInterface interface {
 	Create(*extensions.Ingress) (*extensions.Ingress, error)
 	Update(*extensions.Ingress) (*extensions.Ingress, error)
 	Delete(name string, options *api.DeleteOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
 	Get(name string) (*extensions.Ingress, error)
-	List(opts unversioned.ListOptions) (*extensions.IngressList, error)
-	Watch(opts unversioned.ListOptions) (watch.Interface, error)
+	List(opts api.ListOptions) (*extensions.IngressList, error)
+	Watch(opts api.ListOptions) (watch.Interface, error)
 }
 
 // ingresses implements IngressInterface
@@ -95,6 +95,29 @@ func (c *ingresses) Delete(name string, options *api.DeleteOptions) error {
 		Error()
 }
 
+// DeleteCollection deletes a collection of objects.
+func (c *ingresses) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+	if options == nil {
+		return c.client.Delete().
+			NamespaceIfScoped(c.ns, len(c.ns) > 0).
+			Resource("ingresses").
+			VersionedParams(&listOptions, api.Scheme).
+			Do().
+			Error()
+	}
+	body, err := api.Scheme.EncodeToVersion(options, c.client.APIVersion().String())
+	if err != nil {
+		return err
+	}
+	return c.client.Delete().
+		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Resource("ingresses").
+		VersionedParams(&listOptions, api.Scheme).
+		Body(body).
+		Do().
+		Error()
+}
+
 // Get takes name of the ingress, and returns the corresponding ingress object, and an error if there is any.
 func (c *ingresses) Get(name string) (result *extensions.Ingress, err error) {
 	result = &extensions.Ingress{}
@@ -108,7 +131,7 @@ func (c *ingresses) Get(name string) (result *extensions.Ingress, err error) {
 }
 
 // List takes label and field selectors, and returns the list of Ingresses that match those selectors.
-func (c *ingresses) List(opts unversioned.ListOptions) (result *extensions.IngressList, err error) {
+func (c *ingresses) List(opts api.ListOptions) (result *extensions.IngressList, err error) {
 	result = &extensions.IngressList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -120,7 +143,7 @@ func (c *ingresses) List(opts unversioned.ListOptions) (result *extensions.Ingre
 }
 
 // Watch returns a watch.Interface that watches the requested ingresses.
-func (c *ingresses) Watch(opts unversioned.ListOptions) (watch.Interface, error) {
+func (c *ingresses) Watch(opts api.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/pkg/client/typed/generated/extensions/unversioned/job.go b/pkg/client/typed/generated/extensions/unversioned/job.go
index 86d51092f56..4fcba1d250f 100644
--- a/pkg/client/typed/generated/extensions/unversioned/job.go
+++ b/pkg/client/typed/generated/extensions/unversioned/job.go
@@ -18,7 +18,6 @@ package unversioned
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	extensions "k8s.io/kubernetes/pkg/apis/extensions"
 	watch "k8s.io/kubernetes/pkg/watch"
 )
@@ -33,9 +32,10 @@ type JobInterface interface {
 	Create(*extensions.Job) (*extensions.Job, error)
 	Update(*extensions.Job) (*extensions.Job, error)
 	Delete(name string, options *api.DeleteOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
 	Get(name string) (*extensions.Job, error)
-	List(opts unversioned.ListOptions) (*extensions.JobList, error)
-	Watch(opts unversioned.ListOptions) (watch.Interface, error)
+	List(opts api.ListOptions) (*extensions.JobList, error)
+	Watch(opts api.ListOptions) (watch.Interface, error)
 }
 
 // jobs implements JobInterface
@@ -95,6 +95,29 @@ func (c *jobs) Delete(name string, options *api.DeleteOptions) error {
 		Error()
 }
 
+// DeleteCollection deletes a collection of objects.
+func (c *jobs) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+	if options == nil {
+		return c.client.Delete().
+			NamespaceIfScoped(c.ns, len(c.ns) > 0).
+			Resource("jobs").
+			VersionedParams(&listOptions, api.Scheme).
+			Do().
+			Error()
+	}
+	body, err := api.Scheme.EncodeToVersion(options, c.client.APIVersion().String())
+	if err != nil {
+		return err
+	}
+	return c.client.Delete().
+		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Resource("jobs").
+		VersionedParams(&listOptions, api.Scheme).
+		Body(body).
+		Do().
+		Error()
+}
+
 // Get takes name of the job, and returns the corresponding job object, and an error if there is any.
 func (c *jobs) Get(name string) (result *extensions.Job, err error) {
 	result = &extensions.Job{}
@@ -108,7 +131,7 @@ func (c *jobs) Get(name string) (result *extensions.Job, err error) {
 }
 
 // List takes label and field selectors, and returns the list of Jobs that match those selectors.
-func (c *jobs) List(opts unversioned.ListOptions) (result *extensions.JobList, err error) {
+func (c *jobs) List(opts api.ListOptions) (result *extensions.JobList, err error) {
 	result = &extensions.JobList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -120,7 +143,7 @@ func (c *jobs) List(opts unversioned.ListOptions) (result *extensions.JobList, e
 }
 
 // Watch returns a watch.Interface that watches the requested jobs.
-func (c *jobs) Watch(opts unversioned.ListOptions) (watch.Interface, error) {
+func (c *jobs) Watch(opts api.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/pkg/client/typed/generated/extensions/unversioned/thirdPartyResource.go b/pkg/client/typed/generated/extensions/unversioned/thirdPartyResource.go
index fa0c6db46fe..d90f446a4ae 100644
--- a/pkg/client/typed/generated/extensions/unversioned/thirdPartyResource.go
+++ b/pkg/client/typed/generated/extensions/unversioned/thirdPartyResource.go
@@ -18,7 +18,6 @@ package unversioned
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	extensions "k8s.io/kubernetes/pkg/apis/extensions"
 	watch "k8s.io/kubernetes/pkg/watch"
 )
@@ -33,9 +32,10 @@ type ThirdPartyResourceInterface interface {
 	Create(*extensions.ThirdPartyResource) (*extensions.ThirdPartyResource, error)
 	Update(*extensions.ThirdPartyResource) (*extensions.ThirdPartyResource, error)
 	Delete(name string, options *api.DeleteOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
 	Get(name string) (*extensions.ThirdPartyResource, error)
-	List(opts unversioned.ListOptions) (*extensions.ThirdPartyResourceList, error)
-	Watch(opts unversioned.ListOptions) (watch.Interface, error)
+	List(opts api.ListOptions) (*extensions.ThirdPartyResourceList, error)
+	Watch(opts api.ListOptions) (watch.Interface, error)
 }
 
 // thirdPartyResources implements ThirdPartyResourceInterface
@@ -95,6 +95,29 @@ func (c *thirdPartyResources) Delete(name string, options *api.DeleteOptions) er
 		Error()
 }
 
+// DeleteCollection deletes a collection of objects.
+func (c *thirdPartyResources) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+	if options == nil {
+		return c.client.Delete().
+			NamespaceIfScoped(c.ns, len(c.ns) > 0).
+			Resource("thirdPartyResources").
+			VersionedParams(&listOptions, api.Scheme).
+			Do().
+			Error()
+	}
+	body, err := api.Scheme.EncodeToVersion(options, c.client.APIVersion().String())
+	if err != nil {
+		return err
+	}
+	return c.client.Delete().
+		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Resource("thirdPartyResources").
+		VersionedParams(&listOptions, api.Scheme).
+		Body(body).
+		Do().
+		Error()
+}
+
 // Get takes name of the thirdPartyResource, and returns the corresponding thirdPartyResource object, and an error if there is any.
 func (c *thirdPartyResources) Get(name string) (result *extensions.ThirdPartyResource, err error) {
 	result = &extensions.ThirdPartyResource{}
@@ -108,7 +131,7 @@ func (c *thirdPartyResources) Get(name string) (result *extensions.ThirdPartyRes
 }
 
 // List takes label and field selectors, and returns the list of ThirdPartyResources that match those selectors.
-func (c *thirdPartyResources) List(opts unversioned.ListOptions) (result *extensions.ThirdPartyResourceList, err error) {
+func (c *thirdPartyResources) List(opts api.ListOptions) (result *extensions.ThirdPartyResourceList, err error) {
 	result = &extensions.ThirdPartyResourceList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -120,7 +143,7 @@ func (c *thirdPartyResources) List(opts unversioned.ListOptions) (result *extens
 }
 
 // Watch returns a watch.Interface that watches the requested thirdPartyResources.
-func (c *thirdPartyResources) Watch(opts unversioned.ListOptions) (watch.Interface, error) {
+func (c *thirdPartyResources) Watch(opts api.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/pkg/client/typed/generated/legacy/unversioned/componentStatus.go b/pkg/client/typed/generated/legacy/unversioned/componentStatus.go
index 30249bd419a..5c2f99ed383 100644
--- a/pkg/client/typed/generated/legacy/unversioned/componentStatus.go
+++ b/pkg/client/typed/generated/legacy/unversioned/componentStatus.go
@@ -18,7 +18,6 @@ package unversioned
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	watch "k8s.io/kubernetes/pkg/watch"
 )
 
@@ -32,9 +31,10 @@ type ComponentStatusInterface interface {
 	Create(*api.ComponentStatus) (*api.ComponentStatus, error)
 	Update(*api.ComponentStatus) (*api.ComponentStatus, error)
 	Delete(name string, options *api.DeleteOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
 	Get(name string) (*api.ComponentStatus, error)
-	List(opts unversioned.ListOptions) (*api.ComponentStatusList, error)
-	Watch(opts unversioned.ListOptions) (watch.Interface, error)
+	List(opts api.ListOptions) (*api.ComponentStatusList, error)
+	Watch(opts api.ListOptions) (watch.Interface, error)
 }
 
 // componentStatus implements ComponentStatusInterface
@@ -94,6 +94,29 @@ func (c *componentStatus) Delete(name string, options *api.DeleteOptions) error
 		Error()
 }
 
+// DeleteCollection deletes a collection of objects.
+func (c *componentStatus) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+	if options == nil {
+		return c.client.Delete().
+			NamespaceIfScoped(c.ns, len(c.ns) > 0).
+			Resource("componentStatus").
+			VersionedParams(&listOptions, api.Scheme).
+			Do().
+			Error()
+	}
+	body, err := api.Scheme.EncodeToVersion(options, c.client.APIVersion().String())
+	if err != nil {
+		return err
+	}
+	return c.client.Delete().
+		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Resource("componentStatus").
+		VersionedParams(&listOptions, api.Scheme).
+		Body(body).
+		Do().
+		Error()
+}
+
 // Get takes name of the componentStatus, and returns the corresponding componentStatus object, and an error if there is any.
 func (c *componentStatus) Get(name string) (result *api.ComponentStatus, err error) {
 	result = &api.ComponentStatus{}
@@ -107,7 +130,7 @@ func (c *componentStatus) Get(name string) (result *api.ComponentStatus, err err
 }
 
 // List takes label and field selectors, and returns the list of ComponentStatus that match those selectors.
-func (c *componentStatus) List(opts unversioned.ListOptions) (result *api.ComponentStatusList, err error) {
+func (c *componentStatus) List(opts api.ListOptions) (result *api.ComponentStatusList, err error) {
 	result = &api.ComponentStatusList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -119,7 +142,7 @@ func (c *componentStatus) List(opts unversioned.ListOptions) (result *api.Compon
 }
 
 // Watch returns a watch.Interface that watches the requested componentStatus.
-func (c *componentStatus) Watch(opts unversioned.ListOptions) (watch.Interface, error) {
+func (c *componentStatus) Watch(opts api.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/pkg/client/typed/generated/legacy/unversioned/endpoints.go b/pkg/client/typed/generated/legacy/unversioned/endpoints.go
index 013d76f3070..a21c6a82ae5 100644
--- a/pkg/client/typed/generated/legacy/unversioned/endpoints.go
+++ b/pkg/client/typed/generated/legacy/unversioned/endpoints.go
@@ -18,7 +18,6 @@ package unversioned
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	watch "k8s.io/kubernetes/pkg/watch"
 )
 
@@ -32,9 +31,10 @@ type EndpointsInterface interface {
 	Create(*api.Endpoints) (*api.Endpoints, error)
 	Update(*api.Endpoints) (*api.Endpoints, error)
 	Delete(name string, options *api.DeleteOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
 	Get(name string) (*api.Endpoints, error)
-	List(opts unversioned.ListOptions) (*api.EndpointsList, error)
-	Watch(opts unversioned.ListOptions) (watch.Interface, error)
+	List(opts api.ListOptions) (*api.EndpointsList, error)
+	Watch(opts api.ListOptions) (watch.Interface, error)
 }
 
 // endpoints implements EndpointsInterface
@@ -94,6 +94,29 @@ func (c *endpoints) Delete(name string, options *api.DeleteOptions) error {
 		Error()
 }
 
+// DeleteCollection deletes a collection of objects.
+func (c *endpoints) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+	if options == nil {
+		return c.client.Delete().
+			NamespaceIfScoped(c.ns, len(c.ns) > 0).
+			Resource("endpoints").
+			VersionedParams(&listOptions, api.Scheme).
+			Do().
+			Error()
+	}
+	body, err := api.Scheme.EncodeToVersion(options, c.client.APIVersion().String())
+	if err != nil {
+		return err
+	}
+	return c.client.Delete().
+		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Resource("endpoints").
+		VersionedParams(&listOptions, api.Scheme).
+		Body(body).
+		Do().
+		Error()
+}
+
 // Get takes name of the endpoints, and returns the corresponding endpoints object, and an error if there is any.
 func (c *endpoints) Get(name string) (result *api.Endpoints, err error) {
 	result = &api.Endpoints{}
@@ -107,7 +130,7 @@ func (c *endpoints) Get(name string) (result *api.Endpoints, err error) {
 }
 
 // List takes label and field selectors, and returns the list of Endpoints that match those selectors.
-func (c *endpoints) List(opts unversioned.ListOptions) (result *api.EndpointsList, err error) {
+func (c *endpoints) List(opts api.ListOptions) (result *api.EndpointsList, err error) {
 	result = &api.EndpointsList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -119,7 +142,7 @@ func (c *endpoints) List(opts unversioned.ListOptions) (result *api.EndpointsLis
 }
 
 // Watch returns a watch.Interface that watches the requested endpoints.
-func (c *endpoints) Watch(opts unversioned.ListOptions) (watch.Interface, error) {
+func (c *endpoints) Watch(opts api.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/pkg/client/typed/generated/legacy/unversioned/event.go b/pkg/client/typed/generated/legacy/unversioned/event.go
index 3486c26f0ab..c946a03f31c 100644
--- a/pkg/client/typed/generated/legacy/unversioned/event.go
+++ b/pkg/client/typed/generated/legacy/unversioned/event.go
@@ -18,7 +18,6 @@ package unversioned
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	watch "k8s.io/kubernetes/pkg/watch"
 )
 
@@ -32,9 +31,10 @@ type EventInterface interface {
 	Create(*api.Event) (*api.Event, error)
 	Update(*api.Event) (*api.Event, error)
 	Delete(name string, options *api.DeleteOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
 	Get(name string) (*api.Event, error)
-	List(opts unversioned.ListOptions) (*api.EventList, error)
-	Watch(opts unversioned.ListOptions) (watch.Interface, error)
+	List(opts api.ListOptions) (*api.EventList, error)
+	Watch(opts api.ListOptions) (watch.Interface, error)
 }
 
 // events implements EventInterface
@@ -94,6 +94,29 @@ func (c *events) Delete(name string, options *api.DeleteOptions) error {
 		Error()
 }
 
+// DeleteCollection deletes a collection of objects.
+func (c *events) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+	if options == nil {
+		return c.client.Delete().
+			NamespaceIfScoped(c.ns, len(c.ns) > 0).
+			Resource("events").
+			VersionedParams(&listOptions, api.Scheme).
+			Do().
+			Error()
+	}
+	body, err := api.Scheme.EncodeToVersion(options, c.client.APIVersion().String())
+	if err != nil {
+		return err
+	}
+	return c.client.Delete().
+		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Resource("events").
+		VersionedParams(&listOptions, api.Scheme).
+		Body(body).
+		Do().
+		Error()
+}
+
 // Get takes name of the event, and returns the corresponding event object, and an error if there is any.
 func (c *events) Get(name string) (result *api.Event, err error) {
 	result = &api.Event{}
@@ -107,7 +130,7 @@ func (c *events) Get(name string) (result *api.Event, err error) {
 }
 
 // List takes label and field selectors, and returns the list of Events that match those selectors.
-func (c *events) List(opts unversioned.ListOptions) (result *api.EventList, err error) {
+func (c *events) List(opts api.ListOptions) (result *api.EventList, err error) {
 	result = &api.EventList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -119,7 +142,7 @@ func (c *events) List(opts unversioned.ListOptions) (result *api.EventList, err
 }
 
 // Watch returns a watch.Interface that watches the requested events.
-func (c *events) Watch(opts unversioned.ListOptions) (watch.Interface, error) {
+func (c *events) Watch(opts api.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/pkg/client/typed/generated/legacy/unversioned/limitRange.go b/pkg/client/typed/generated/legacy/unversioned/limitRange.go
index 3cd9644f718..18bca654700 100644
--- a/pkg/client/typed/generated/legacy/unversioned/limitRange.go
+++ b/pkg/client/typed/generated/legacy/unversioned/limitRange.go
@@ -18,7 +18,6 @@ package unversioned
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	watch "k8s.io/kubernetes/pkg/watch"
 )
 
@@ -32,9 +31,10 @@ type LimitRangeInterface interface {
 	Create(*api.LimitRange) (*api.LimitRange, error)
 	Update(*api.LimitRange) (*api.LimitRange, error)
 	Delete(name string, options *api.DeleteOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
 	Get(name string) (*api.LimitRange, error)
-	List(opts unversioned.ListOptions) (*api.LimitRangeList, error)
-	Watch(opts unversioned.ListOptions) (watch.Interface, error)
+	List(opts api.ListOptions) (*api.LimitRangeList, error)
+	Watch(opts api.ListOptions) (watch.Interface, error)
 }
 
 // limitRanges implements LimitRangeInterface
@@ -94,6 +94,29 @@ func (c *limitRanges) Delete(name string, options *api.DeleteOptions) error {
 		Error()
 }
 
+// DeleteCollection deletes a collection of objects.
+func (c *limitRanges) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+	if options == nil {
+		return c.client.Delete().
+			NamespaceIfScoped(c.ns, len(c.ns) > 0).
+			Resource("limitRanges").
+			VersionedParams(&listOptions, api.Scheme).
+			Do().
+			Error()
+	}
+	body, err := api.Scheme.EncodeToVersion(options, c.client.APIVersion().String())
+	if err != nil {
+		return err
+	}
+	return c.client.Delete().
+		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Resource("limitRanges").
+		VersionedParams(&listOptions, api.Scheme).
+		Body(body).
+		Do().
+		Error()
+}
+
 // Get takes name of the limitRange, and returns the corresponding limitRange object, and an error if there is any.
 func (c *limitRanges) Get(name string) (result *api.LimitRange, err error) {
 	result = &api.LimitRange{}
@@ -107,7 +130,7 @@ func (c *limitRanges) Get(name string) (result *api.LimitRange, err error) {
 }
 
 // List takes label and field selectors, and returns the list of LimitRanges that match those selectors.
-func (c *limitRanges) List(opts unversioned.ListOptions) (result *api.LimitRangeList, err error) {
+func (c *limitRanges) List(opts api.ListOptions) (result *api.LimitRangeList, err error) {
 	result = &api.LimitRangeList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -119,7 +142,7 @@ func (c *limitRanges) List(opts unversioned.ListOptions) (result *api.LimitRange
 }
 
 // Watch returns a watch.Interface that watches the requested limitRanges.
-func (c *limitRanges) Watch(opts unversioned.ListOptions) (watch.Interface, error) {
+func (c *limitRanges) Watch(opts api.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/pkg/client/typed/generated/legacy/unversioned/namespace.go b/pkg/client/typed/generated/legacy/unversioned/namespace.go
index afdecac467e..b8c357bd02c 100644
--- a/pkg/client/typed/generated/legacy/unversioned/namespace.go
+++ b/pkg/client/typed/generated/legacy/unversioned/namespace.go
@@ -18,7 +18,6 @@ package unversioned
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	watch "k8s.io/kubernetes/pkg/watch"
 )
 
@@ -32,9 +31,10 @@ type NamespaceInterface interface {
 	Create(*api.Namespace) (*api.Namespace, error)
 	Update(*api.Namespace) (*api.Namespace, error)
 	Delete(name string, options *api.DeleteOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
 	Get(name string) (*api.Namespace, error)
-	List(opts unversioned.ListOptions) (*api.NamespaceList, error)
-	Watch(opts unversioned.ListOptions) (watch.Interface, error)
+	List(opts api.ListOptions) (*api.NamespaceList, error)
+	Watch(opts api.ListOptions) (watch.Interface, error)
 }
 
 // namespaces implements NamespaceInterface
@@ -94,6 +94,29 @@ func (c *namespaces) Delete(name string, options *api.DeleteOptions) error {
 		Error()
 }
 
+// DeleteCollection deletes a collection of objects.
+func (c *namespaces) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+	if options == nil {
+		return c.client.Delete().
+			NamespaceIfScoped(c.ns, len(c.ns) > 0).
+			Resource("namespaces").
+			VersionedParams(&listOptions, api.Scheme).
+			Do().
+			Error()
+	}
+	body, err := api.Scheme.EncodeToVersion(options, c.client.APIVersion().String())
+	if err != nil {
+		return err
+	}
+	return c.client.Delete().
+		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Resource("namespaces").
+		VersionedParams(&listOptions, api.Scheme).
+		Body(body).
+		Do().
+		Error()
+}
+
 // Get takes name of the namespace, and returns the corresponding namespace object, and an error if there is any.
 func (c *namespaces) Get(name string) (result *api.Namespace, err error) {
 	result = &api.Namespace{}
@@ -107,7 +130,7 @@ func (c *namespaces) Get(name string) (result *api.Namespace, err error) {
 }
 
 // List takes label and field selectors, and returns the list of Namespaces that match those selectors.
-func (c *namespaces) List(opts unversioned.ListOptions) (result *api.NamespaceList, err error) {
+func (c *namespaces) List(opts api.ListOptions) (result *api.NamespaceList, err error) {
 	result = &api.NamespaceList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -119,7 +142,7 @@ func (c *namespaces) List(opts unversioned.ListOptions) (result *api.NamespaceLi
 }
 
 // Watch returns a watch.Interface that watches the requested namespaces.
-func (c *namespaces) Watch(opts unversioned.ListOptions) (watch.Interface, error) {
+func (c *namespaces) Watch(opts api.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/pkg/client/typed/generated/legacy/unversioned/node.go b/pkg/client/typed/generated/legacy/unversioned/node.go
index d39849aed64..302aefcb6a4 100644
--- a/pkg/client/typed/generated/legacy/unversioned/node.go
+++ b/pkg/client/typed/generated/legacy/unversioned/node.go
@@ -18,7 +18,6 @@ package unversioned
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	watch "k8s.io/kubernetes/pkg/watch"
 )
 
@@ -32,9 +31,10 @@ type NodeInterface interface {
 	Create(*api.Node) (*api.Node, error)
 	Update(*api.Node) (*api.Node, error)
 	Delete(name string, options *api.DeleteOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
 	Get(name string) (*api.Node, error)
-	List(opts unversioned.ListOptions) (*api.NodeList, error)
-	Watch(opts unversioned.ListOptions) (watch.Interface, error)
+	List(opts api.ListOptions) (*api.NodeList, error)
+	Watch(opts api.ListOptions) (watch.Interface, error)
 }
 
 // nodes implements NodeInterface
@@ -94,6 +94,29 @@ func (c *nodes) Delete(name string, options *api.DeleteOptions) error {
 		Error()
 }
 
+// DeleteCollection deletes a collection of objects.
+func (c *nodes) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+	if options == nil {
+		return c.client.Delete().
+			NamespaceIfScoped(c.ns, len(c.ns) > 0).
+			Resource("nodes").
+			VersionedParams(&listOptions, api.Scheme).
+			Do().
+			Error()
+	}
+	body, err := api.Scheme.EncodeToVersion(options, c.client.APIVersion().String())
+	if err != nil {
+		return err
+	}
+	return c.client.Delete().
+		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Resource("nodes").
+		VersionedParams(&listOptions, api.Scheme).
+		Body(body).
+		Do().
+		Error()
+}
+
 // Get takes name of the node, and returns the corresponding node object, and an error if there is any.
 func (c *nodes) Get(name string) (result *api.Node, err error) {
 	result = &api.Node{}
@@ -107,7 +130,7 @@ func (c *nodes) Get(name string) (result *api.Node, err error) {
 }
 
 // List takes label and field selectors, and returns the list of Nodes that match those selectors.
-func (c *nodes) List(opts unversioned.ListOptions) (result *api.NodeList, err error) {
+func (c *nodes) List(opts api.ListOptions) (result *api.NodeList, err error) {
 	result = &api.NodeList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -119,7 +142,7 @@ func (c *nodes) List(opts unversioned.ListOptions) (result *api.NodeList, err er
 }
 
 // Watch returns a watch.Interface that watches the requested nodes.
-func (c *nodes) Watch(opts unversioned.ListOptions) (watch.Interface, error) {
+func (c *nodes) Watch(opts api.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/pkg/client/typed/generated/legacy/unversioned/persistentVolume.go b/pkg/client/typed/generated/legacy/unversioned/persistentVolume.go
index 4b1b72368d0..96ef207caa7 100644
--- a/pkg/client/typed/generated/legacy/unversioned/persistentVolume.go
+++ b/pkg/client/typed/generated/legacy/unversioned/persistentVolume.go
@@ -18,7 +18,6 @@ package unversioned
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	watch "k8s.io/kubernetes/pkg/watch"
 )
 
@@ -32,9 +31,10 @@ type PersistentVolumeInterface interface {
 	Create(*api.PersistentVolume) (*api.PersistentVolume, error)
 	Update(*api.PersistentVolume) (*api.PersistentVolume, error)
 	Delete(name string, options *api.DeleteOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
 	Get(name string) (*api.PersistentVolume, error)
-	List(opts unversioned.ListOptions) (*api.PersistentVolumeList, error)
-	Watch(opts unversioned.ListOptions) (watch.Interface, error)
+	List(opts api.ListOptions) (*api.PersistentVolumeList, error)
+	Watch(opts api.ListOptions) (watch.Interface, error)
 }
 
 // persistentVolumes implements PersistentVolumeInterface
@@ -94,6 +94,29 @@ func (c *persistentVolumes) Delete(name string, options *api.DeleteOptions) erro
 		Error()
 }
 
+// DeleteCollection deletes a collection of objects.
+func (c *persistentVolumes) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+	if options == nil {
+		return c.client.Delete().
+			NamespaceIfScoped(c.ns, len(c.ns) > 0).
+			Resource("persistentVolumes").
+			VersionedParams(&listOptions, api.Scheme).
+			Do().
+			Error()
+	}
+	body, err := api.Scheme.EncodeToVersion(options, c.client.APIVersion().String())
+	if err != nil {
+		return err
+	}
+	return c.client.Delete().
+		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Resource("persistentVolumes").
+		VersionedParams(&listOptions, api.Scheme).
+		Body(body).
+		Do().
+		Error()
+}
+
 // Get takes name of the persistentVolume, and returns the corresponding persistentVolume object, and an error if there is any.
 func (c *persistentVolumes) Get(name string) (result *api.PersistentVolume, err error) {
 	result = &api.PersistentVolume{}
@@ -107,7 +130,7 @@ func (c *persistentVolumes) Get(name string) (result *api.PersistentVolume, err
 }
 
 // List takes label and field selectors, and returns the list of PersistentVolumes that match those selectors.
-func (c *persistentVolumes) List(opts unversioned.ListOptions) (result *api.PersistentVolumeList, err error) {
+func (c *persistentVolumes) List(opts api.ListOptions) (result *api.PersistentVolumeList, err error) {
 	result = &api.PersistentVolumeList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -119,7 +142,7 @@ func (c *persistentVolumes) List(opts unversioned.ListOptions) (result *api.Pers
 }
 
 // Watch returns a watch.Interface that watches the requested persistentVolumes.
-func (c *persistentVolumes) Watch(opts unversioned.ListOptions) (watch.Interface, error) {
+func (c *persistentVolumes) Watch(opts api.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/pkg/client/typed/generated/legacy/unversioned/persistentVolumeClaim.go b/pkg/client/typed/generated/legacy/unversioned/persistentVolumeClaim.go
index 3350cf01f93..de8aab26f29 100644
--- a/pkg/client/typed/generated/legacy/unversioned/persistentVolumeClaim.go
+++ b/pkg/client/typed/generated/legacy/unversioned/persistentVolumeClaim.go
@@ -18,7 +18,6 @@ package unversioned
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	watch "k8s.io/kubernetes/pkg/watch"
 )
 
@@ -32,9 +31,10 @@ type PersistentVolumeClaimInterface interface {
 	Create(*api.PersistentVolumeClaim) (*api.PersistentVolumeClaim, error)
 	Update(*api.PersistentVolumeClaim) (*api.PersistentVolumeClaim, error)
 	Delete(name string, options *api.DeleteOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
 	Get(name string) (*api.PersistentVolumeClaim, error)
-	List(opts unversioned.ListOptions) (*api.PersistentVolumeClaimList, error)
-	Watch(opts unversioned.ListOptions) (watch.Interface, error)
+	List(opts api.ListOptions) (*api.PersistentVolumeClaimList, error)
+	Watch(opts api.ListOptions) (watch.Interface, error)
 }
 
 // persistentVolumeClaims implements PersistentVolumeClaimInterface
@@ -94,6 +94,29 @@ func (c *persistentVolumeClaims) Delete(name string, options *api.DeleteOptions)
 		Error()
 }
 
+// DeleteCollection deletes a collection of objects.
+func (c *persistentVolumeClaims) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+	if options == nil {
+		return c.client.Delete().
+			NamespaceIfScoped(c.ns, len(c.ns) > 0).
+			Resource("persistentVolumeClaims").
+			VersionedParams(&listOptions, api.Scheme).
+			Do().
+			Error()
+	}
+	body, err := api.Scheme.EncodeToVersion(options, c.client.APIVersion().String())
+	if err != nil {
+		return err
+	}
+	return c.client.Delete().
+		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Resource("persistentVolumeClaims").
+		VersionedParams(&listOptions, api.Scheme).
+		Body(body).
+		Do().
+		Error()
+}
+
 // Get takes name of the persistentVolumeClaim, and returns the corresponding persistentVolumeClaim object, and an error if there is any.
 func (c *persistentVolumeClaims) Get(name string) (result *api.PersistentVolumeClaim, err error) {
 	result = &api.PersistentVolumeClaim{}
@@ -107,7 +130,7 @@ func (c *persistentVolumeClaims) Get(name string) (result *api.PersistentVolumeC
 }
 
 // List takes label and field selectors, and returns the list of PersistentVolumeClaims that match those selectors.
-func (c *persistentVolumeClaims) List(opts unversioned.ListOptions) (result *api.PersistentVolumeClaimList, err error) {
+func (c *persistentVolumeClaims) List(opts api.ListOptions) (result *api.PersistentVolumeClaimList, err error) {
 	result = &api.PersistentVolumeClaimList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -119,7 +142,7 @@ func (c *persistentVolumeClaims) List(opts unversioned.ListOptions) (result *api
 }
 
 // Watch returns a watch.Interface that watches the requested persistentVolumeClaims.
-func (c *persistentVolumeClaims) Watch(opts unversioned.ListOptions) (watch.Interface, error) {
+func (c *persistentVolumeClaims) Watch(opts api.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/pkg/client/typed/generated/legacy/unversioned/pod.go b/pkg/client/typed/generated/legacy/unversioned/pod.go
index 804d0dece9e..1c5e33c5100 100644
--- a/pkg/client/typed/generated/legacy/unversioned/pod.go
+++ b/pkg/client/typed/generated/legacy/unversioned/pod.go
@@ -18,7 +18,6 @@ package unversioned
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	watch "k8s.io/kubernetes/pkg/watch"
 )
 
@@ -32,9 +31,10 @@ type PodInterface interface {
 	Create(*api.Pod) (*api.Pod, error)
 	Update(*api.Pod) (*api.Pod, error)
 	Delete(name string, options *api.DeleteOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
 	Get(name string) (*api.Pod, error)
-	List(opts unversioned.ListOptions) (*api.PodList, error)
-	Watch(opts unversioned.ListOptions) (watch.Interface, error)
+	List(opts api.ListOptions) (*api.PodList, error)
+	Watch(opts api.ListOptions) (watch.Interface, error)
 }
 
 // pods implements PodInterface
@@ -94,6 +94,29 @@ func (c *pods) Delete(name string, options *api.DeleteOptions) error {
 		Error()
 }
 
+// DeleteCollection deletes a collection of objects.
+func (c *pods) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+	if options == nil {
+		return c.client.Delete().
+			NamespaceIfScoped(c.ns, len(c.ns) > 0).
+			Resource("pods").
+			VersionedParams(&listOptions, api.Scheme).
+			Do().
+			Error()
+	}
+	body, err := api.Scheme.EncodeToVersion(options, c.client.APIVersion().String())
+	if err != nil {
+		return err
+	}
+	return c.client.Delete().
+		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Resource("pods").
+		VersionedParams(&listOptions, api.Scheme).
+		Body(body).
+		Do().
+		Error()
+}
+
 // Get takes name of the pod, and returns the corresponding pod object, and an error if there is any.
 func (c *pods) Get(name string) (result *api.Pod, err error) {
 	result = &api.Pod{}
@@ -107,7 +130,7 @@ func (c *pods) Get(name string) (result *api.Pod, err error) {
 }
 
 // List takes label and field selectors, and returns the list of Pods that match those selectors.
-func (c *pods) List(opts unversioned.ListOptions) (result *api.PodList, err error) {
+func (c *pods) List(opts api.ListOptions) (result *api.PodList, err error) {
 	result = &api.PodList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -119,7 +142,7 @@ func (c *pods) List(opts unversioned.ListOptions) (result *api.PodList, err erro
 }
 
 // Watch returns a watch.Interface that watches the requested pods.
-func (c *pods) Watch(opts unversioned.ListOptions) (watch.Interface, error) {
+func (c *pods) Watch(opts api.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/pkg/client/typed/generated/legacy/unversioned/podTemplate.go b/pkg/client/typed/generated/legacy/unversioned/podTemplate.go
index a1c2476b670..e7abe8f87e5 100644
--- a/pkg/client/typed/generated/legacy/unversioned/podTemplate.go
+++ b/pkg/client/typed/generated/legacy/unversioned/podTemplate.go
@@ -18,7 +18,6 @@ package unversioned
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	watch "k8s.io/kubernetes/pkg/watch"
 )
 
@@ -32,9 +31,10 @@ type PodTemplateInterface interface {
 	Create(*api.PodTemplate) (*api.PodTemplate, error)
 	Update(*api.PodTemplate) (*api.PodTemplate, error)
 	Delete(name string, options *api.DeleteOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
 	Get(name string) (*api.PodTemplate, error)
-	List(opts unversioned.ListOptions) (*api.PodTemplateList, error)
-	Watch(opts unversioned.ListOptions) (watch.Interface, error)
+	List(opts api.ListOptions) (*api.PodTemplateList, error)
+	Watch(opts api.ListOptions) (watch.Interface, error)
 }
 
 // podTemplates implements PodTemplateInterface
@@ -94,6 +94,29 @@ func (c *podTemplates) Delete(name string, options *api.DeleteOptions) error {
 		Error()
 }
 
+// DeleteCollection deletes a collection of objects.
+func (c *podTemplates) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+	if options == nil {
+		return c.client.Delete().
+			NamespaceIfScoped(c.ns, len(c.ns) > 0).
+			Resource("podTemplates").
+			VersionedParams(&listOptions, api.Scheme).
+			Do().
+			Error()
+	}
+	body, err := api.Scheme.EncodeToVersion(options, c.client.APIVersion().String())
+	if err != nil {
+		return err
+	}
+	return c.client.Delete().
+		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Resource("podTemplates").
+		VersionedParams(&listOptions, api.Scheme).
+		Body(body).
+		Do().
+		Error()
+}
+
 // Get takes name of the podTemplate, and returns the corresponding podTemplate object, and an error if there is any.
 func (c *podTemplates) Get(name string) (result *api.PodTemplate, err error) {
 	result = &api.PodTemplate{}
@@ -107,7 +130,7 @@ func (c *podTemplates) Get(name string) (result *api.PodTemplate, err error) {
 }
 
 // List takes label and field selectors, and returns the list of PodTemplates that match those selectors.
-func (c *podTemplates) List(opts unversioned.ListOptions) (result *api.PodTemplateList, err error) {
+func (c *podTemplates) List(opts api.ListOptions) (result *api.PodTemplateList, err error) {
 	result = &api.PodTemplateList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -119,7 +142,7 @@ func (c *podTemplates) List(opts unversioned.ListOptions) (result *api.PodTempla
 }
 
 // Watch returns a watch.Interface that watches the requested podTemplates.
-func (c *podTemplates) Watch(opts unversioned.ListOptions) (watch.Interface, error) {
+func (c *podTemplates) Watch(opts api.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/pkg/client/typed/generated/legacy/unversioned/replicationController.go b/pkg/client/typed/generated/legacy/unversioned/replicationController.go
index a39f38e44cf..62c8d96e877 100644
--- a/pkg/client/typed/generated/legacy/unversioned/replicationController.go
+++ b/pkg/client/typed/generated/legacy/unversioned/replicationController.go
@@ -18,7 +18,6 @@ package unversioned
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	watch "k8s.io/kubernetes/pkg/watch"
 )
 
@@ -32,9 +31,10 @@ type ReplicationControllerInterface interface {
 	Create(*api.ReplicationController) (*api.ReplicationController, error)
 	Update(*api.ReplicationController) (*api.ReplicationController, error)
 	Delete(name string, options *api.DeleteOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
 	Get(name string) (*api.ReplicationController, error)
-	List(opts unversioned.ListOptions) (*api.ReplicationControllerList, error)
-	Watch(opts unversioned.ListOptions) (watch.Interface, error)
+	List(opts api.ListOptions) (*api.ReplicationControllerList, error)
+	Watch(opts api.ListOptions) (watch.Interface, error)
 }
 
 // replicationControllers implements ReplicationControllerInterface
@@ -94,6 +94,29 @@ func (c *replicationControllers) Delete(name string, options *api.DeleteOptions)
 		Error()
 }
 
+// DeleteCollection deletes a collection of objects.
+func (c *replicationControllers) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+	if options == nil {
+		return c.client.Delete().
+			NamespaceIfScoped(c.ns, len(c.ns) > 0).
+			Resource("replicationControllers").
+			VersionedParams(&listOptions, api.Scheme).
+			Do().
+			Error()
+	}
+	body, err := api.Scheme.EncodeToVersion(options, c.client.APIVersion().String())
+	if err != nil {
+		return err
+	}
+	return c.client.Delete().
+		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Resource("replicationControllers").
+		VersionedParams(&listOptions, api.Scheme).
+		Body(body).
+		Do().
+		Error()
+}
+
 // Get takes name of the replicationController, and returns the corresponding replicationController object, and an error if there is any.
 func (c *replicationControllers) Get(name string) (result *api.ReplicationController, err error) {
 	result = &api.ReplicationController{}
@@ -107,7 +130,7 @@ func (c *replicationControllers) Get(name string) (result *api.ReplicationContro
 }
 
 // List takes label and field selectors, and returns the list of ReplicationControllers that match those selectors.
-func (c *replicationControllers) List(opts unversioned.ListOptions) (result *api.ReplicationControllerList, err error) {
+func (c *replicationControllers) List(opts api.ListOptions) (result *api.ReplicationControllerList, err error) {
 	result = &api.ReplicationControllerList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -119,7 +142,7 @@ func (c *replicationControllers) List(opts unversioned.ListOptions) (result *api
 }
 
 // Watch returns a watch.Interface that watches the requested replicationControllers.
-func (c *replicationControllers) Watch(opts unversioned.ListOptions) (watch.Interface, error) {
+func (c *replicationControllers) Watch(opts api.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/pkg/client/typed/generated/legacy/unversioned/resourceQuota.go b/pkg/client/typed/generated/legacy/unversioned/resourceQuota.go
index efe37230579..0a799bff313 100644
--- a/pkg/client/typed/generated/legacy/unversioned/resourceQuota.go
+++ b/pkg/client/typed/generated/legacy/unversioned/resourceQuota.go
@@ -18,7 +18,6 @@ package unversioned
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	watch "k8s.io/kubernetes/pkg/watch"
 )
 
@@ -32,9 +31,10 @@ type ResourceQuotaInterface interface {
 	Create(*api.ResourceQuota) (*api.ResourceQuota, error)
 	Update(*api.ResourceQuota) (*api.ResourceQuota, error)
 	Delete(name string, options *api.DeleteOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
 	Get(name string) (*api.ResourceQuota, error)
-	List(opts unversioned.ListOptions) (*api.ResourceQuotaList, error)
-	Watch(opts unversioned.ListOptions) (watch.Interface, error)
+	List(opts api.ListOptions) (*api.ResourceQuotaList, error)
+	Watch(opts api.ListOptions) (watch.Interface, error)
 }
 
 // resourceQuotas implements ResourceQuotaInterface
@@ -94,6 +94,29 @@ func (c *resourceQuotas) Delete(name string, options *api.DeleteOptions) error {
 		Error()
 }
 
+// DeleteCollection deletes a collection of objects.
+func (c *resourceQuotas) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+	if options == nil {
+		return c.client.Delete().
+			NamespaceIfScoped(c.ns, len(c.ns) > 0).
+			Resource("resourceQuotas").
+			VersionedParams(&listOptions, api.Scheme).
+			Do().
+			Error()
+	}
+	body, err := api.Scheme.EncodeToVersion(options, c.client.APIVersion().String())
+	if err != nil {
+		return err
+	}
+	return c.client.Delete().
+		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Resource("resourceQuotas").
+		VersionedParams(&listOptions, api.Scheme).
+		Body(body).
+		Do().
+		Error()
+}
+
 // Get takes name of the resourceQuota, and returns the corresponding resourceQuota object, and an error if there is any.
 func (c *resourceQuotas) Get(name string) (result *api.ResourceQuota, err error) {
 	result = &api.ResourceQuota{}
@@ -107,7 +130,7 @@ func (c *resourceQuotas) Get(name string) (result *api.ResourceQuota, err error)
 }
 
 // List takes label and field selectors, and returns the list of ResourceQuotas that match those selectors.
-func (c *resourceQuotas) List(opts unversioned.ListOptions) (result *api.ResourceQuotaList, err error) {
+func (c *resourceQuotas) List(opts api.ListOptions) (result *api.ResourceQuotaList, err error) {
 	result = &api.ResourceQuotaList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -119,7 +142,7 @@ func (c *resourceQuotas) List(opts unversioned.ListOptions) (result *api.Resourc
 }
 
 // Watch returns a watch.Interface that watches the requested resourceQuotas.
-func (c *resourceQuotas) Watch(opts unversioned.ListOptions) (watch.Interface, error) {
+func (c *resourceQuotas) Watch(opts api.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/pkg/client/typed/generated/legacy/unversioned/secret.go b/pkg/client/typed/generated/legacy/unversioned/secret.go
index 57b0538bd7d..ebfbdf1fe07 100644
--- a/pkg/client/typed/generated/legacy/unversioned/secret.go
+++ b/pkg/client/typed/generated/legacy/unversioned/secret.go
@@ -18,7 +18,6 @@ package unversioned
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	watch "k8s.io/kubernetes/pkg/watch"
 )
 
@@ -32,9 +31,10 @@ type SecretInterface interface {
 	Create(*api.Secret) (*api.Secret, error)
 	Update(*api.Secret) (*api.Secret, error)
 	Delete(name string, options *api.DeleteOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
 	Get(name string) (*api.Secret, error)
-	List(opts unversioned.ListOptions) (*api.SecretList, error)
-	Watch(opts unversioned.ListOptions) (watch.Interface, error)
+	List(opts api.ListOptions) (*api.SecretList, error)
+	Watch(opts api.ListOptions) (watch.Interface, error)
 }
 
 // secrets implements SecretInterface
@@ -94,6 +94,29 @@ func (c *secrets) Delete(name string, options *api.DeleteOptions) error {
 		Error()
 }
 
+// DeleteCollection deletes a collection of objects.
+func (c *secrets) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+	if options == nil {
+		return c.client.Delete().
+			NamespaceIfScoped(c.ns, len(c.ns) > 0).
+			Resource("secrets").
+			VersionedParams(&listOptions, api.Scheme).
+			Do().
+			Error()
+	}
+	body, err := api.Scheme.EncodeToVersion(options, c.client.APIVersion().String())
+	if err != nil {
+		return err
+	}
+	return c.client.Delete().
+		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Resource("secrets").
+		VersionedParams(&listOptions, api.Scheme).
+		Body(body).
+		Do().
+		Error()
+}
+
 // Get takes name of the secret, and returns the corresponding secret object, and an error if there is any.
 func (c *secrets) Get(name string) (result *api.Secret, err error) {
 	result = &api.Secret{}
@@ -107,7 +130,7 @@ func (c *secrets) Get(name string) (result *api.Secret, err error) {
 }
 
 // List takes label and field selectors, and returns the list of Secrets that match those selectors.
-func (c *secrets) List(opts unversioned.ListOptions) (result *api.SecretList, err error) {
+func (c *secrets) List(opts api.ListOptions) (result *api.SecretList, err error) {
 	result = &api.SecretList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -119,7 +142,7 @@ func (c *secrets) List(opts unversioned.ListOptions) (result *api.SecretList, er
 }
 
 // Watch returns a watch.Interface that watches the requested secrets.
-func (c *secrets) Watch(opts unversioned.ListOptions) (watch.Interface, error) {
+func (c *secrets) Watch(opts api.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/pkg/client/typed/generated/legacy/unversioned/service.go b/pkg/client/typed/generated/legacy/unversioned/service.go
index 83163009b97..f04e7d0188b 100644
--- a/pkg/client/typed/generated/legacy/unversioned/service.go
+++ b/pkg/client/typed/generated/legacy/unversioned/service.go
@@ -18,7 +18,6 @@ package unversioned
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	watch "k8s.io/kubernetes/pkg/watch"
 )
 
@@ -32,9 +31,10 @@ type ServiceInterface interface {
 	Create(*api.Service) (*api.Service, error)
 	Update(*api.Service) (*api.Service, error)
 	Delete(name string, options *api.DeleteOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
 	Get(name string) (*api.Service, error)
-	List(opts unversioned.ListOptions) (*api.ServiceList, error)
-	Watch(opts unversioned.ListOptions) (watch.Interface, error)
+	List(opts api.ListOptions) (*api.ServiceList, error)
+	Watch(opts api.ListOptions) (watch.Interface, error)
 }
 
 // services implements ServiceInterface
@@ -94,6 +94,29 @@ func (c *services) Delete(name string, options *api.DeleteOptions) error {
 		Error()
 }
 
+// DeleteCollection deletes a collection of objects.
+func (c *services) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+	if options == nil {
+		return c.client.Delete().
+			NamespaceIfScoped(c.ns, len(c.ns) > 0).
+			Resource("services").
+			VersionedParams(&listOptions, api.Scheme).
+			Do().
+			Error()
+	}
+	body, err := api.Scheme.EncodeToVersion(options, c.client.APIVersion().String())
+	if err != nil {
+		return err
+	}
+	return c.client.Delete().
+		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Resource("services").
+		VersionedParams(&listOptions, api.Scheme).
+		Body(body).
+		Do().
+		Error()
+}
+
 // Get takes name of the service, and returns the corresponding service object, and an error if there is any.
 func (c *services) Get(name string) (result *api.Service, err error) {
 	result = &api.Service{}
@@ -107,7 +130,7 @@ func (c *services) Get(name string) (result *api.Service, err error) {
 }
 
 // List takes label and field selectors, and returns the list of Services that match those selectors.
-func (c *services) List(opts unversioned.ListOptions) (result *api.ServiceList, err error) {
+func (c *services) List(opts api.ListOptions) (result *api.ServiceList, err error) {
 	result = &api.ServiceList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -119,7 +142,7 @@ func (c *services) List(opts unversioned.ListOptions) (result *api.ServiceList,
 }
 
 // Watch returns a watch.Interface that watches the requested services.
-func (c *services) Watch(opts unversioned.ListOptions) (watch.Interface, error) {
+func (c *services) Watch(opts api.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).
diff --git a/pkg/client/typed/generated/legacy/unversioned/serviceAccount.go b/pkg/client/typed/generated/legacy/unversioned/serviceAccount.go
index fc4e28e64aa..efa0a2a647a 100644
--- a/pkg/client/typed/generated/legacy/unversioned/serviceAccount.go
+++ b/pkg/client/typed/generated/legacy/unversioned/serviceAccount.go
@@ -18,7 +18,6 @@ package unversioned
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	watch "k8s.io/kubernetes/pkg/watch"
 )
 
@@ -32,9 +31,10 @@ type ServiceAccountInterface interface {
 	Create(*api.ServiceAccount) (*api.ServiceAccount, error)
 	Update(*api.ServiceAccount) (*api.ServiceAccount, error)
 	Delete(name string, options *api.DeleteOptions) error
+	DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error
 	Get(name string) (*api.ServiceAccount, error)
-	List(opts unversioned.ListOptions) (*api.ServiceAccountList, error)
-	Watch(opts unversioned.ListOptions) (watch.Interface, error)
+	List(opts api.ListOptions) (*api.ServiceAccountList, error)
+	Watch(opts api.ListOptions) (watch.Interface, error)
 }
 
 // serviceAccounts implements ServiceAccountInterface
@@ -94,6 +94,29 @@ func (c *serviceAccounts) Delete(name string, options *api.DeleteOptions) error
 		Error()
 }
 
+// DeleteCollection deletes a collection of objects.
+func (c *serviceAccounts) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error {
+	if options == nil {
+		return c.client.Delete().
+			NamespaceIfScoped(c.ns, len(c.ns) > 0).
+			Resource("serviceAccounts").
+			VersionedParams(&listOptions, api.Scheme).
+			Do().
+			Error()
+	}
+	body, err := api.Scheme.EncodeToVersion(options, c.client.APIVersion().String())
+	if err != nil {
+		return err
+	}
+	return c.client.Delete().
+		NamespaceIfScoped(c.ns, len(c.ns) > 0).
+		Resource("serviceAccounts").
+		VersionedParams(&listOptions, api.Scheme).
+		Body(body).
+		Do().
+		Error()
+}
+
 // Get takes name of the serviceAccount, and returns the corresponding serviceAccount object, and an error if there is any.
 func (c *serviceAccounts) Get(name string) (result *api.ServiceAccount, err error) {
 	result = &api.ServiceAccount{}
@@ -107,7 +130,7 @@ func (c *serviceAccounts) Get(name string) (result *api.ServiceAccount, err erro
 }
 
 // List takes label and field selectors, and returns the list of ServiceAccounts that match those selectors.
-func (c *serviceAccounts) List(opts unversioned.ListOptions) (result *api.ServiceAccountList, err error) {
+func (c *serviceAccounts) List(opts api.ListOptions) (result *api.ServiceAccountList, err error) {
 	result = &api.ServiceAccountList{}
 	err = c.client.Get().
 		Namespace(c.ns).
@@ -119,7 +142,7 @@ func (c *serviceAccounts) List(opts unversioned.ListOptions) (result *api.Servic
 }
 
 // Watch returns a watch.Interface that watches the requested serviceAccounts.
-func (c *serviceAccounts) Watch(opts unversioned.ListOptions) (watch.Interface, error) {
+func (c *serviceAccounts) Watch(opts api.ListOptions) (watch.Interface, error) {
 	return c.client.Get().
 		Prefix("watch").
 		Namespace(c.ns).