diff --git a/rest/zz_generated.deepcopy.go b/rest/zz_generated.deepcopy.go
index c750da3e..1632e1ef 100644
--- a/rest/zz_generated.deepcopy.go
+++ b/rest/zz_generated.deepcopy.go
@@ -25,7 +25,9 @@ import (
 	reflect "reflect"
 )
 
-// Deprecated: GetGeneratedDeepCopyFuncs returns the generated funcs, since we aren't registering them.
+// GetGeneratedDeepCopyFuncs returns the generated funcs, since we aren't registering them.
+//
+// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented.
 func GetGeneratedDeepCopyFuncs() []conversion.GeneratedDeepCopyFunc {
 	return []conversion.GeneratedDeepCopyFunc{
 		{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
@@ -56,12 +58,12 @@ func (in *TLSClientConfig) DeepCopyInto(out *TLSClientConfig) {
 	return
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, creating a new TLSClientConfig.
-func (x *TLSClientConfig) DeepCopy() *TLSClientConfig {
-	if x == nil {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TLSClientConfig.
+func (in *TLSClientConfig) DeepCopy() *TLSClientConfig {
+	if in == nil {
 		return nil
 	}
 	out := new(TLSClientConfig)
-	x.DeepCopyInto(out)
+	in.DeepCopyInto(out)
 	return out
 }
diff --git a/tools/clientcmd/api/v1/zz_generated.deepcopy.go b/tools/clientcmd/api/v1/zz_generated.deepcopy.go
index 386626fd..b123a9fb 100644
--- a/tools/clientcmd/api/v1/zz_generated.deepcopy.go
+++ b/tools/clientcmd/api/v1/zz_generated.deepcopy.go
@@ -26,13 +26,14 @@ import (
 	reflect "reflect"
 )
 
-// Deprecated: register deep-copy functions.
 func init() {
 	SchemeBuilder.Register(RegisterDeepCopies)
 }
 
-// Deprecated: RegisterDeepCopies adds deep-copy functions to the given scheme. Public
+// RegisterDeepCopies adds deep-copy functions to the given scheme. Public
 // to allow building arbitrary schemes.
+//
+// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented.
 func RegisterDeepCopies(scheme *runtime.Scheme) error {
 	return scheme.AddGeneratedDeepCopyFuncs(
 		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
@@ -127,13 +128,13 @@ func (in *AuthInfo) DeepCopyInto(out *AuthInfo) {
 	return
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, creating a new AuthInfo.
-func (x *AuthInfo) DeepCopy() *AuthInfo {
-	if x == nil {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AuthInfo.
+func (in *AuthInfo) DeepCopy() *AuthInfo {
+	if in == nil {
 		return nil
 	}
 	out := new(AuthInfo)
-	x.DeepCopyInto(out)
+	in.DeepCopyInto(out)
 	return out
 }
 
@@ -150,13 +151,13 @@ func (in *AuthProviderConfig) DeepCopyInto(out *AuthProviderConfig) {
 	return
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, creating a new AuthProviderConfig.
-func (x *AuthProviderConfig) DeepCopy() *AuthProviderConfig {
-	if x == nil {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AuthProviderConfig.
+func (in *AuthProviderConfig) DeepCopy() *AuthProviderConfig {
+	if in == nil {
 		return nil
 	}
 	out := new(AuthProviderConfig)
-	x.DeepCopyInto(out)
+	in.DeepCopyInto(out)
 	return out
 }
 
@@ -178,13 +179,13 @@ func (in *Cluster) DeepCopyInto(out *Cluster) {
 	return
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, creating a new Cluster.
-func (x *Cluster) DeepCopy() *Cluster {
-	if x == nil {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Cluster.
+func (in *Cluster) DeepCopy() *Cluster {
+	if in == nil {
 		return nil
 	}
 	out := new(Cluster)
-	x.DeepCopyInto(out)
+	in.DeepCopyInto(out)
 	return out
 }
 
@@ -223,19 +224,19 @@ func (in *Config) DeepCopyInto(out *Config) {
 	return
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, creating a new Config.
-func (x *Config) DeepCopy() *Config {
-	if x == nil {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Config.
+func (in *Config) DeepCopy() *Config {
+	if in == nil {
 		return nil
 	}
 	out := new(Config)
-	x.DeepCopyInto(out)
+	in.DeepCopyInto(out)
 	return out
 }
 
 // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (x *Config) DeepCopyObject() runtime.Object {
-	if c := x.DeepCopy(); c != nil {
+func (in *Config) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
 		return c
 	} else {
 		return nil
@@ -255,13 +256,13 @@ func (in *Context) DeepCopyInto(out *Context) {
 	return
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, creating a new Context.
-func (x *Context) DeepCopy() *Context {
-	if x == nil {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Context.
+func (in *Context) DeepCopy() *Context {
+	if in == nil {
 		return nil
 	}
 	out := new(Context)
-	x.DeepCopyInto(out)
+	in.DeepCopyInto(out)
 	return out
 }
 
@@ -272,13 +273,13 @@ func (in *NamedAuthInfo) DeepCopyInto(out *NamedAuthInfo) {
 	return
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, creating a new NamedAuthInfo.
-func (x *NamedAuthInfo) DeepCopy() *NamedAuthInfo {
-	if x == nil {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NamedAuthInfo.
+func (in *NamedAuthInfo) DeepCopy() *NamedAuthInfo {
+	if in == nil {
 		return nil
 	}
 	out := new(NamedAuthInfo)
-	x.DeepCopyInto(out)
+	in.DeepCopyInto(out)
 	return out
 }
 
@@ -289,13 +290,13 @@ func (in *NamedCluster) DeepCopyInto(out *NamedCluster) {
 	return
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, creating a new NamedCluster.
-func (x *NamedCluster) DeepCopy() *NamedCluster {
-	if x == nil {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NamedCluster.
+func (in *NamedCluster) DeepCopy() *NamedCluster {
+	if in == nil {
 		return nil
 	}
 	out := new(NamedCluster)
-	x.DeepCopyInto(out)
+	in.DeepCopyInto(out)
 	return out
 }
 
@@ -306,13 +307,13 @@ func (in *NamedContext) DeepCopyInto(out *NamedContext) {
 	return
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, creating a new NamedContext.
-func (x *NamedContext) DeepCopy() *NamedContext {
-	if x == nil {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NamedContext.
+func (in *NamedContext) DeepCopy() *NamedContext {
+	if in == nil {
 		return nil
 	}
 	out := new(NamedContext)
-	x.DeepCopyInto(out)
+	in.DeepCopyInto(out)
 	return out
 }
 
@@ -323,13 +324,13 @@ func (in *NamedExtension) DeepCopyInto(out *NamedExtension) {
 	return
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, creating a new NamedExtension.
-func (x *NamedExtension) DeepCopy() *NamedExtension {
-	if x == nil {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NamedExtension.
+func (in *NamedExtension) DeepCopy() *NamedExtension {
+	if in == nil {
 		return nil
 	}
 	out := new(NamedExtension)
-	x.DeepCopyInto(out)
+	in.DeepCopyInto(out)
 	return out
 }
 
@@ -346,12 +347,12 @@ func (in *Preferences) DeepCopyInto(out *Preferences) {
 	return
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, creating a new Preferences.
-func (x *Preferences) DeepCopy() *Preferences {
-	if x == nil {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Preferences.
+func (in *Preferences) DeepCopy() *Preferences {
+	if in == nil {
 		return nil
 	}
 	out := new(Preferences)
-	x.DeepCopyInto(out)
+	in.DeepCopyInto(out)
 	return out
 }
diff --git a/tools/clientcmd/api/zz_generated.deepcopy.go b/tools/clientcmd/api/zz_generated.deepcopy.go
index 4262f608..b787f0dd 100644
--- a/tools/clientcmd/api/zz_generated.deepcopy.go
+++ b/tools/clientcmd/api/zz_generated.deepcopy.go
@@ -26,13 +26,14 @@ import (
 	reflect "reflect"
 )
 
-// Deprecated: register deep-copy functions.
 func init() {
 	SchemeBuilder.Register(RegisterDeepCopies)
 }
 
-// Deprecated: RegisterDeepCopies adds deep-copy functions to the given scheme. Public
+// RegisterDeepCopies adds deep-copy functions to the given scheme. Public
 // to allow building arbitrary schemes.
+//
+// Deprecated: deepcopy registration will go away when static deepcopy is fully implemented.
 func RegisterDeepCopies(scheme *runtime.Scheme) error {
 	return scheme.AddGeneratedDeepCopyFuncs(
 		conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
@@ -115,13 +116,13 @@ func (in *AuthInfo) DeepCopyInto(out *AuthInfo) {
 	return
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, creating a new AuthInfo.
-func (x *AuthInfo) DeepCopy() *AuthInfo {
-	if x == nil {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AuthInfo.
+func (in *AuthInfo) DeepCopy() *AuthInfo {
+	if in == nil {
 		return nil
 	}
 	out := new(AuthInfo)
-	x.DeepCopyInto(out)
+	in.DeepCopyInto(out)
 	return out
 }
 
@@ -138,13 +139,13 @@ func (in *AuthProviderConfig) DeepCopyInto(out *AuthProviderConfig) {
 	return
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, creating a new AuthProviderConfig.
-func (x *AuthProviderConfig) DeepCopy() *AuthProviderConfig {
-	if x == nil {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AuthProviderConfig.
+func (in *AuthProviderConfig) DeepCopy() *AuthProviderConfig {
+	if in == nil {
 		return nil
 	}
 	out := new(AuthProviderConfig)
-	x.DeepCopyInto(out)
+	in.DeepCopyInto(out)
 	return out
 }
 
@@ -170,13 +171,13 @@ func (in *Cluster) DeepCopyInto(out *Cluster) {
 	return
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, creating a new Cluster.
-func (x *Cluster) DeepCopy() *Cluster {
-	if x == nil {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Cluster.
+func (in *Cluster) DeepCopy() *Cluster {
+	if in == nil {
 		return nil
 	}
 	out := new(Cluster)
-	x.DeepCopyInto(out)
+	in.DeepCopyInto(out)
 	return out
 }
 
@@ -234,19 +235,19 @@ func (in *Config) DeepCopyInto(out *Config) {
 	return
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, creating a new Config.
-func (x *Config) DeepCopy() *Config {
-	if x == nil {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Config.
+func (in *Config) DeepCopy() *Config {
+	if in == nil {
 		return nil
 	}
 	out := new(Config)
-	x.DeepCopyInto(out)
+	in.DeepCopyInto(out)
 	return out
 }
 
 // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (x *Config) DeepCopyObject() runtime.Object {
-	if c := x.DeepCopy(); c != nil {
+func (in *Config) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
 		return c
 	} else {
 		return nil
@@ -270,13 +271,13 @@ func (in *Context) DeepCopyInto(out *Context) {
 	return
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, creating a new Context.
-func (x *Context) DeepCopy() *Context {
-	if x == nil {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Context.
+func (in *Context) DeepCopy() *Context {
+	if in == nil {
 		return nil
 	}
 	out := new(Context)
-	x.DeepCopyInto(out)
+	in.DeepCopyInto(out)
 	return out
 }
 
@@ -297,12 +298,12 @@ func (in *Preferences) DeepCopyInto(out *Preferences) {
 	return
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, creating a new Preferences.
-func (x *Preferences) DeepCopy() *Preferences {
-	if x == nil {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Preferences.
+func (in *Preferences) DeepCopy() *Preferences {
+	if in == nil {
 		return nil
 	}
 	out := new(Preferences)
-	x.DeepCopyInto(out)
+	in.DeepCopyInto(out)
 	return out
 }