diff --git a/pkg/apis/audit/v1alpha1/zz_generated.conversion.go b/pkg/apis/audit/v1alpha1/zz_generated.conversion.go
index 2d9015e49..c7b60063f 100644
--- a/pkg/apis/audit/v1alpha1/zz_generated.conversion.go
+++ b/pkg/apis/audit/v1alpha1/zz_generated.conversion.go
@@ -23,7 +23,7 @@ package v1alpha1
 import (
 	unsafe "unsafe"
 
-	authentication_v1 "k8s.io/api/authentication/v1"
+	authenticationv1 "k8s.io/api/authentication/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	conversion "k8s.io/apimachinery/pkg/conversion"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -99,7 +99,7 @@ func autoConvert_audit_Event_To_v1alpha1_Event(in *audit.Event, out *Event, s co
 	if err := s.Convert(&in.User, &out.User, 0); err != nil {
 		return err
 	}
-	out.ImpersonatedUser = (*authentication_v1.UserInfo)(unsafe.Pointer(in.ImpersonatedUser))
+	out.ImpersonatedUser = (*authenticationv1.UserInfo)(unsafe.Pointer(in.ImpersonatedUser))
 	out.SourceIPs = *(*[]string)(unsafe.Pointer(&in.SourceIPs))
 	out.UserAgent = in.UserAgent
 	if in.ObjectRef != nil {
diff --git a/pkg/apis/audit/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/audit/v1alpha1/zz_generated.deepcopy.go
index 8cc93b931..1926b6205 100644
--- a/pkg/apis/audit/v1alpha1/zz_generated.deepcopy.go
+++ b/pkg/apis/audit/v1alpha1/zz_generated.deepcopy.go
@@ -22,7 +22,7 @@ package v1alpha1
 
 import (
 	v1 "k8s.io/api/authentication/v1"
-	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 )
 
@@ -50,7 +50,7 @@ func (in *Event) DeepCopyInto(out *Event) {
 	}
 	if in.ResponseStatus != nil {
 		in, out := &in.ResponseStatus, &out.ResponseStatus
-		*out = new(meta_v1.Status)
+		*out = new(metav1.Status)
 		(*in).DeepCopyInto(*out)
 	}
 	if in.RequestObject != nil {
diff --git a/pkg/apis/audit/v1beta1/zz_generated.conversion.go b/pkg/apis/audit/v1beta1/zz_generated.conversion.go
index c8d8d8f98..9f6f448c1 100644
--- a/pkg/apis/audit/v1beta1/zz_generated.conversion.go
+++ b/pkg/apis/audit/v1beta1/zz_generated.conversion.go
@@ -23,7 +23,7 @@ package v1beta1
 import (
 	unsafe "unsafe"
 
-	authentication_v1 "k8s.io/api/authentication/v1"
+	authenticationv1 "k8s.io/api/authentication/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	conversion "k8s.io/apimachinery/pkg/conversion"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -91,7 +91,7 @@ func autoConvert_audit_Event_To_v1beta1_Event(in *audit.Event, out *Event, s con
 	if err := s.Convert(&in.User, &out.User, 0); err != nil {
 		return err
 	}
-	out.ImpersonatedUser = (*authentication_v1.UserInfo)(unsafe.Pointer(in.ImpersonatedUser))
+	out.ImpersonatedUser = (*authenticationv1.UserInfo)(unsafe.Pointer(in.ImpersonatedUser))
 	out.SourceIPs = *(*[]string)(unsafe.Pointer(&in.SourceIPs))
 	out.UserAgent = in.UserAgent
 	out.ObjectRef = (*ObjectReference)(unsafe.Pointer(in.ObjectRef))
diff --git a/pkg/apis/audit/v1beta1/zz_generated.deepcopy.go b/pkg/apis/audit/v1beta1/zz_generated.deepcopy.go
index 29081dee2..e8f7adffd 100644
--- a/pkg/apis/audit/v1beta1/zz_generated.deepcopy.go
+++ b/pkg/apis/audit/v1beta1/zz_generated.deepcopy.go
@@ -22,7 +22,7 @@ package v1beta1
 
 import (
 	v1 "k8s.io/api/authentication/v1"
-	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 )
 
@@ -50,7 +50,7 @@ func (in *Event) DeepCopyInto(out *Event) {
 	}
 	if in.ResponseStatus != nil {
 		in, out := &in.ResponseStatus, &out.ResponseStatus
-		*out = new(meta_v1.Status)
+		*out = new(metav1.Status)
 		(*in).DeepCopyInto(*out)
 	}
 	if in.RequestObject != nil {
diff --git a/pkg/apis/example/v1/zz_generated.conversion.go b/pkg/apis/example/v1/zz_generated.conversion.go
index 94dfbe69e..470d839ed 100644
--- a/pkg/apis/example/v1/zz_generated.conversion.go
+++ b/pkg/apis/example/v1/zz_generated.conversion.go
@@ -23,7 +23,7 @@ package v1
 import (
 	unsafe "unsafe"
 
-	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	conversion "k8s.io/apimachinery/pkg/conversion"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	example "k8s.io/apiserver/pkg/apis/example"
@@ -201,7 +201,7 @@ func autoConvert_v1_PodStatus_To_example_PodStatus(in *PodStatus, out *example.P
 	out.Reason = in.Reason
 	out.HostIP = in.HostIP
 	out.PodIP = in.PodIP
-	out.StartTime = (*meta_v1.Time)(unsafe.Pointer(in.StartTime))
+	out.StartTime = (*metav1.Time)(unsafe.Pointer(in.StartTime))
 	return nil
 }
 
@@ -217,7 +217,7 @@ func autoConvert_example_PodStatus_To_v1_PodStatus(in *example.PodStatus, out *P
 	out.Reason = in.Reason
 	out.HostIP = in.HostIP
 	out.PodIP = in.PodIP
-	out.StartTime = (*meta_v1.Time)(unsafe.Pointer(in.StartTime))
+	out.StartTime = (*metav1.Time)(unsafe.Pointer(in.StartTime))
 	return nil
 }
 
diff --git a/pkg/apis/example2/v1/zz_generated.conversion.go b/pkg/apis/example2/v1/zz_generated.conversion.go
index 206a264f7..53fb547c0 100644
--- a/pkg/apis/example2/v1/zz_generated.conversion.go
+++ b/pkg/apis/example2/v1/zz_generated.conversion.go
@@ -21,7 +21,7 @@ limitations under the License.
 package v1
 
 import (
-	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	conversion "k8s.io/apimachinery/pkg/conversion"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	example "k8s.io/apiserver/pkg/apis/example"
@@ -77,14 +77,14 @@ func Convert_example_ReplicaSet_To_v1_ReplicaSet(in *example.ReplicaSet, out *Re
 }
 
 func autoConvert_v1_ReplicaSetSpec_To_example_ReplicaSetSpec(in *ReplicaSetSpec, out *example.ReplicaSetSpec, s conversion.Scope) error {
-	if err := meta_v1.Convert_Pointer_int32_To_int32(&in.Replicas, &out.Replicas, s); err != nil {
+	if err := metav1.Convert_Pointer_int32_To_int32(&in.Replicas, &out.Replicas, s); err != nil {
 		return err
 	}
 	return nil
 }
 
 func autoConvert_example_ReplicaSetSpec_To_v1_ReplicaSetSpec(in *example.ReplicaSetSpec, out *ReplicaSetSpec, s conversion.Scope) error {
-	if err := meta_v1.Convert_int32_To_Pointer_int32(&in.Replicas, &out.Replicas, s); err != nil {
+	if err := metav1.Convert_int32_To_Pointer_int32(&in.Replicas, &out.Replicas, s); err != nil {
 		return err
 	}
 	return nil
diff --git a/pkg/registry/rest/zz_generated.deepcopy.go b/pkg/registry/rest/zz_generated.deepcopy.go
index 1ddd11973..ef8c371ba 100644
--- a/pkg/registry/rest/zz_generated.deepcopy.go
+++ b/pkg/registry/rest/zz_generated.deepcopy.go
@@ -27,9 +27,7 @@ import (
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ConnectRequest) DeepCopyInto(out *ConnectRequest) {
 	*out = *in
-	if in.Options == nil {
-		out.Options = nil
-	} else {
+	if in.Options != nil {
 		out.Options = in.Options.DeepCopyObject()
 	}
 	return