diff --git a/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_type.go b/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_type.go
index 52609835b0d..c1a661e5081 100644
--- a/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_type.go
+++ b/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_type.go
@@ -145,11 +145,10 @@ func (g *genFakeForType) GenerateType(c *generator.Context, t *types.Type, w io.
 
 	if g.version == "" {
 		m["DeleteOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api", Name: "DeleteOptions"})
-		m["ListOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api", Name: "ListOptions"})
 	} else {
 		m["DeleteOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api/v1", Name: "DeleteOptions"})
-		m["ListOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api/v1", Name: "ListOptions"})
 	}
+	m["ListOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/apimachinery/pkg/apis/meta/v1", Name: "ListOptions"})
 	m["GetOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/apimachinery/pkg/apis/meta/v1", Name: "GetOptions"})
 
 	noMethods := extractBoolTagOrDie("noMethods", t.SecondClosestCommentLines) == true
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 fb3414f9877..feb90ba8b39 100644
--- a/cmd/libs/go2idl/client-gen/generators/generator_for_type.go
+++ b/cmd/libs/go2idl/client-gen/generators/generator_for_type.go
@@ -92,11 +92,10 @@ func (g *genClientForType) GenerateType(c *generator.Context, t *types.Type, w i
 
 	if g.version == "" {
 		m["DeleteOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api", Name: "DeleteOptions"})
-		m["ListOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api", Name: "ListOptions"})
 	} else {
 		m["DeleteOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api/v1", Name: "DeleteOptions"})
-		m["ListOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api/v1", Name: "ListOptions"})
 	}
+	m["ListOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/apimachinery/pkg/apis/meta/v1", Name: "ListOptions"})
 	m["GetOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/apimachinery/pkg/apis/meta/v1", Name: "GetOptions"})
 
 	sw.Do(getterComment, m)
diff --git a/cmd/libs/go2idl/informer-gen/generators/informer.go b/cmd/libs/go2idl/informer-gen/generators/informer.go
index 49399c2d1d5..079845321b1 100644
--- a/cmd/libs/go2idl/informer-gen/generators/informer.go
+++ b/cmd/libs/go2idl/informer-gen/generators/informer.go
@@ -69,16 +69,14 @@ func (g *informerGenerator) GenerateType(c *generator.Context, t *types.Type, w
 	listerPackage := fmt.Sprintf("%s/%s/%s", g.listersPackage, g.groupVersion.Group.NonEmpty(), strings.ToLower(g.groupVersion.Version.NonEmpty()))
 
 	var (
-		clientSetInterface, namespaceAll *types.Type
-		informerFor                      string
+		clientSetInterface *types.Type
+		informerFor        string
 	)
 	if len(g.groupVersion.Version) == 0 {
 		clientSetInterface = c.Universe.Type(types.Name{Package: g.internalClientSetPackage, Name: "Interface"})
-		namespaceAll = c.Universe.Type(apiNamespaceAll)
 		informerFor = "InternalInformerFor"
 	} else {
 		clientSetInterface = c.Universe.Type(types.Name{Package: g.versionedClientSetPackage, Name: "Interface"})
-		namespaceAll = c.Universe.Type(v1NamespaceAll)
 		informerFor = "VersionedInformerFor"
 	}
 
@@ -96,7 +94,7 @@ func (g *informerGenerator) GenerateType(c *generator.Context, t *types.Type, w
 		"interfacesSharedInformerFactory": c.Universe.Type(types.Name{Package: g.internalInterfacesPackage, Name: "SharedInformerFactory"}),
 		"listOptions":                     c.Universe.Type(listOptions),
 		"lister":                          c.Universe.Type(types.Name{Package: listerPackage, Name: t.Name.Name + "Lister"}),
-		"namespaceAll":                    namespaceAll,
+		"namespaceAll":                    c.Universe.Type(metav1NamespaceAll),
 		"namespaced":                      !extractBoolTagOrDie("nonNamespaced", t.SecondClosestCommentLines),
 		"newLister":                       c.Universe.Function(types.Name{Package: listerPackage, Name: "New" + t.Name.Name + "Lister"}),
 		"runtimeObject":                   c.Universe.Type(runtimeObject),
@@ -140,18 +138,10 @@ func new$.type|public$Informer(client $.clientSetInterface|raw$, resyncPeriod $.
 	sharedIndexInformer := $.cacheNewSharedIndexInformer|raw$(
 		&$.cacheListWatch|raw${
 			ListFunc: func(options $.v1ListOptions|raw$) ($.runtimeObject|raw$, error) {
-				var internalOptions $.listOptions|raw$
-				if err := $.apiScheme|raw$.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.$.group$$.version$().$.type|publicPlural$($if .namespaced$$.namespaceAll|raw$$end$).List(internalOptions)
+				return client.$.group$$.version$().$.type|publicPlural$($if .namespaced$$.namespaceAll|raw$$end$).List(options)
 			},
 			WatchFunc: func(options $.v1ListOptions|raw$) ($.watchInterface|raw$, error) {
-				var internalOptions $.listOptions|raw$
-				if err := $.apiScheme|raw$.Convert(&options, &internalOptions, nil); err != nil {
-					return nil, err
-				}
-				return client.$.group$$.version$().$.type|publicPlural$($if .namespaced$$.namespaceAll|raw$$end$).Watch(internalOptions)
+				return client.$.group$$.version$().$.type|publicPlural$($if .namespaced$$.namespaceAll|raw$$end$).Watch(options)
 			},
 		},
 		&$.type|raw${},
diff --git a/cmd/libs/go2idl/informer-gen/generators/types.go b/cmd/libs/go2idl/informer-gen/generators/types.go
index 06d2fac8a99..3a15b819969 100644
--- a/cmd/libs/go2idl/informer-gen/generators/types.go
+++ b/cmd/libs/go2idl/informer-gen/generators/types.go
@@ -19,7 +19,6 @@ package generators
 import "k8s.io/gengo/types"
 
 var (
-	apiNamespaceAll             = types.Name{Package: "k8s.io/kubernetes/pkg/api", Name: "NamespaceAll"}
 	apiScheme                   = types.Name{Package: "k8s.io/kubernetes/pkg/api", Name: "Scheme"}
 	cacheGenericLister          = types.Name{Package: "k8s.io/kubernetes/pkg/client/cache", Name: "GenericLister"}
 	cacheIndexers               = types.Name{Package: "k8s.io/kubernetes/pkg/client/cache", Name: "Indexers"}
@@ -36,7 +35,7 @@ var (
 	schemaGroupVersionResource  = types.Name{Package: "k8s.io/apimachinery/pkg/runtime/schema", Name: "GroupVersionResource"}
 	syncMutex                   = types.Name{Package: "sync", Name: "Mutex"}
 	timeDuration                = types.Name{Package: "time", Name: "Duration"}
-	v1ListOptions               = types.Name{Package: "k8s.io/kubernetes/pkg/api/v1", Name: "ListOptions"}
-	v1NamespaceAll              = types.Name{Package: "k8s.io/kubernetes/pkg/api/v1", Name: "NamespaceAll"}
+	v1ListOptions               = types.Name{Package: "k8s.io/apimachinery/pkg/apis/meta/v1", Name: "ListOptions"}
+	metav1NamespaceAll          = types.Name{Package: "k8s.io/apimachinery/pkg/apis/meta/v1", Name: "NamespaceAll"}
 	watchInterface              = types.Name{Package: "k8s.io/apimachinery/pkg/watch", Name: "Interface"}
 )