diff --git a/cmd/kubeadm/app/apis/bootstraptoken/doc.go b/cmd/kubeadm/app/apis/bootstraptoken/doc.go
index b7be16ba469..8c6fe1a273e 100644
--- a/cmd/kubeadm/app/apis/bootstraptoken/doc.go
+++ b/cmd/kubeadm/app/apis/bootstraptoken/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 
 // Package bootstraptoken contains an API and utilities wrapping the
 // "bootstrap.kubernetes.io/token" Secret type to ease its usage in kubeadm.
-package bootstraptoken // import "k8s.io/kubernetes/cmd/kubeadm/app/apis/bootstraptoken"
+package bootstraptoken
diff --git a/cmd/kubeadm/app/apis/kubeadm/doc.go b/cmd/kubeadm/app/apis/kubeadm/doc.go
index 8998f14fe79..2e7a92c3c79 100644
--- a/cmd/kubeadm/app/apis/kubeadm/doc.go
+++ b/cmd/kubeadm/app/apis/kubeadm/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 
 // Package kubeadm is the package that contains the libraries that drive the kubeadm binary.
 // kubeadm is responsible for handling a Kubernetes cluster's lifecycle.
-package kubeadm // import "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
+package kubeadm
diff --git a/cmd/kubeadm/app/apis/kubeadm/v1beta3/doc.go b/cmd/kubeadm/app/apis/kubeadm/v1beta3/doc.go
index 338f6d69e27..e75a464eed5 100644
--- a/cmd/kubeadm/app/apis/kubeadm/v1beta3/doc.go
+++ b/cmd/kubeadm/app/apis/kubeadm/v1beta3/doc.go
@@ -282,4 +282,4 @@ limitations under the License.
 // node only (e.g. the node ip).
 //
 // - APIEndpoint, that represents the endpoint of the instance of the API server to be eventually deployed on this node.
-package v1beta3 // import "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3"
+package v1beta3
diff --git a/cmd/kubeadm/app/apis/kubeadm/v1beta4/doc.go b/cmd/kubeadm/app/apis/kubeadm/v1beta4/doc.go
index c0c223b79ed..12f2e097e69 100644
--- a/cmd/kubeadm/app/apis/kubeadm/v1beta4/doc.go
+++ b/cmd/kubeadm/app/apis/kubeadm/v1beta4/doc.go
@@ -351,4 +351,4 @@ limitations under the License.
 // The UpgradeConfiguration structure includes a few substructures that only apply to different subcommands of "kubeadm upgrade".
 // For example, the "apply" substructure will be used with the "kubeadm upgrade apply" subcommand and all other substructures
 // will be ignored in such a case.
-package v1beta4 // import "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta4"
+package v1beta4
diff --git a/cmd/kubeadm/app/apis/output/doc.go b/cmd/kubeadm/app/apis/output/doc.go
index eaca8994d2a..d66954f6f9f 100644
--- a/cmd/kubeadm/app/apis/output/doc.go
+++ b/cmd/kubeadm/app/apis/output/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 // The purpose of the kubeadm structured output is to have a well
 // defined versioned output format that other software that uses
 // kubeadm for cluster deployments can use and rely on.
-package output // import "k8s.io/kubernetes/cmd/kubeadm/app/apis/output"
+package output
diff --git a/cmd/kubeadm/app/apis/output/v1alpha3/doc.go b/cmd/kubeadm/app/apis/output/v1alpha3/doc.go
index e25776c6ecc..c6bb05d82f7 100644
--- a/cmd/kubeadm/app/apis/output/v1alpha3/doc.go
+++ b/cmd/kubeadm/app/apis/output/v1alpha3/doc.go
@@ -29,4 +29,4 @@ limitations under the License.
 //     with the CertificateExpirationInfo structure.
 //   - Introduce a (breaking) change to the UpgradePlan structure used by "kubeadm upgrade plan".
 //     UpgradePlan now contains a list of AvailableUpgrade structures.
-package v1alpha3 // import "k8s.io/kubernetes/cmd/kubeadm/app/apis/output/v1alpha3"
+package v1alpha3
diff --git a/pkg/apis/abac/v0/doc.go b/pkg/apis/abac/v0/doc.go
index 44aa923c3d2..081edf0d0d0 100644
--- a/pkg/apis/abac/v0/doc.go
+++ b/pkg/apis/abac/v0/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 
 // +groupName=abac.authorization.kubernetes.io
 
-package v0 // import "k8s.io/kubernetes/pkg/apis/abac/v0"
+package v0
diff --git a/pkg/apis/abac/v1beta1/doc.go b/pkg/apis/abac/v1beta1/doc.go
index 62ac4e21d6f..07647ddc357 100644
--- a/pkg/apis/abac/v1beta1/doc.go
+++ b/pkg/apis/abac/v1beta1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=abac.authorization.kubernetes.io
 
-package v1beta1 // import "k8s.io/kubernetes/pkg/apis/abac/v1beta1"
+package v1beta1
diff --git a/pkg/apis/admission/doc.go b/pkg/apis/admission/doc.go
index bbf4d2e92d2..31833ab69f8 100644
--- a/pkg/apis/admission/doc.go
+++ b/pkg/apis/admission/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +groupName=admission.k8s.io
 
-package admission // import "k8s.io/kubernetes/pkg/apis/admission"
+package admission
diff --git a/pkg/apis/admission/v1/doc.go b/pkg/apis/admission/v1/doc.go
index e27e8aee596..25bc3d7e712 100644
--- a/pkg/apis/admission/v1/doc.go
+++ b/pkg/apis/admission/v1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=admission.k8s.io
 
-package v1 // import "k8s.io/kubernetes/pkg/apis/admission/v1"
+package v1
diff --git a/pkg/apis/admission/v1beta1/doc.go b/pkg/apis/admission/v1beta1/doc.go
index 61213759636..d47e2b8030e 100644
--- a/pkg/apis/admission/v1beta1/doc.go
+++ b/pkg/apis/admission/v1beta1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=admission.k8s.io
 
-package v1beta1 // import "k8s.io/kubernetes/pkg/apis/admission/v1beta1"
+package v1beta1
diff --git a/pkg/apis/admissionregistration/doc.go b/pkg/apis/admissionregistration/doc.go
index a81502498bc..b1630fb1235 100644
--- a/pkg/apis/admissionregistration/doc.go
+++ b/pkg/apis/admissionregistration/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 // AdmissionConfiguration and AdmissionPluginConfiguration are legacy static admission plugin configuration
 // ValidatingWebhookConfiguration, and MutatingWebhookConfiguration are for the
 // new dynamic admission controller configuration.
-package admissionregistration // import "k8s.io/kubernetes/pkg/apis/admissionregistration"
+package admissionregistration
diff --git a/pkg/apis/admissionregistration/v1/doc.go b/pkg/apis/admissionregistration/v1/doc.go
index 86443170da2..e789114906b 100644
--- a/pkg/apis/admissionregistration/v1/doc.go
+++ b/pkg/apis/admissionregistration/v1/doc.go
@@ -24,4 +24,4 @@ limitations under the License.
 // AdmissionConfiguration and AdmissionPluginConfiguration are legacy static admission plugin configuration
 // ValidatingWebhookConfiguration, and MutatingWebhookConfiguration are for the
 // new dynamic admission controller configuration.
-package v1 // import "k8s.io/kubernetes/pkg/apis/admissionregistration/v1"
+package v1
diff --git a/pkg/apis/admissionregistration/v1alpha1/doc.go b/pkg/apis/admissionregistration/v1alpha1/doc.go
index 2fec4005ee9..73f0360c0be 100644
--- a/pkg/apis/admissionregistration/v1alpha1/doc.go
+++ b/pkg/apis/admissionregistration/v1alpha1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 // +groupName=admissionregistration.k8s.io
 
 // Package v1alpha1 is the v1alpha1 version of the API.
-package v1alpha1 // import "k8s.io/kubernetes/pkg/apis/admissionregistration/v1alpha1"
+package v1alpha1
diff --git a/pkg/apis/admissionregistration/v1beta1/doc.go b/pkg/apis/admissionregistration/v1beta1/doc.go
index df2827ee28f..0afc7b4ae7e 100644
--- a/pkg/apis/admissionregistration/v1beta1/doc.go
+++ b/pkg/apis/admissionregistration/v1beta1/doc.go
@@ -24,4 +24,4 @@ limitations under the License.
 // AdmissionConfiguration and AdmissionPluginConfiguration are legacy static admission plugin configuration
 // ValidatingWebhookConfiguration, and MutatingWebhookConfiguration are for the
 // new dynamic admission controller configuration.
-package v1beta1 // import "k8s.io/kubernetes/pkg/apis/admissionregistration/v1beta1"
+package v1beta1
diff --git a/pkg/apis/apidiscovery/doc.go b/pkg/apis/apidiscovery/doc.go
index 2a4f27ad6ca..fc6bec4ac1b 100644
--- a/pkg/apis/apidiscovery/doc.go
+++ b/pkg/apis/apidiscovery/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +groupName=apidiscovery.k8s.io
 
 // Package apidiscovery provides api definitions for the "apidiscovery.k8s.io" api group.
-package apidiscovery // import "k8s.io/kubernetes/pkg/apis/apidiscovery"
+package apidiscovery
diff --git a/pkg/apis/apidiscovery/v2/doc.go b/pkg/apis/apidiscovery/v2/doc.go
index 8e4b06aad00..f956dc52e9b 100644
--- a/pkg/apis/apidiscovery/v2/doc.go
+++ b/pkg/apis/apidiscovery/v2/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=apidiscovery.k8s.io
 
-package v2 // import "k8s.io/kubernetes/pkg/apis/apidiscovery/v2"
+package v2
diff --git a/pkg/apis/apidiscovery/v2beta1/doc.go b/pkg/apis/apidiscovery/v2beta1/doc.go
index 8ed608d024e..252b501c476 100644
--- a/pkg/apis/apidiscovery/v2beta1/doc.go
+++ b/pkg/apis/apidiscovery/v2beta1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=apidiscovery.k8s.io
 
-package v2beta1 // import "k8s.io/kubernetes/pkg/apis/apidiscovery/v2beta1"
+package v2beta1
diff --git a/pkg/apis/apiserverinternal/doc.go b/pkg/apis/apiserverinternal/doc.go
index f26f5175eb0..7bb87bb3fcc 100644
--- a/pkg/apis/apiserverinternal/doc.go
+++ b/pkg/apis/apiserverinternal/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 
 // Package apiserverinternal contains the "internal" version of the API used by
 // the apiservers themselves.
-package apiserverinternal // import "k8s.io/kubernetes/pkg/apis/apiserverinternal"
+package apiserverinternal
diff --git a/pkg/apis/apiserverinternal/v1alpha1/doc.go b/pkg/apis/apiserverinternal/v1alpha1/doc.go
index 8a665272f91..9f5f1d2158a 100644
--- a/pkg/apis/apiserverinternal/v1alpha1/doc.go
+++ b/pkg/apis/apiserverinternal/v1alpha1/doc.go
@@ -23,4 +23,4 @@ limitations under the License.
 
 // Package v1alpha1 contains the v1alpha1 version of the API used by the
 // apiservers themselves.
-package v1alpha1 // import "k8s.io/kubernetes/pkg/apis/apiserverinternal/v1alpha1"
+package v1alpha1
diff --git a/pkg/apis/apps/doc.go b/pkg/apis/apps/doc.go
index 1ff549998c0..91d11759829 100644
--- a/pkg/apis/apps/doc.go
+++ b/pkg/apis/apps/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package apps // import "k8s.io/kubernetes/pkg/apis/apps"
+package apps
diff --git a/pkg/apis/apps/v1/doc.go b/pkg/apis/apps/v1/doc.go
index 90409248fd8..d4138d0681f 100644
--- a/pkg/apis/apps/v1/doc.go
+++ b/pkg/apis/apps/v1/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:defaulter-gen-input=k8s.io/api/apps/v1
 
-package v1 // import "k8s.io/kubernetes/pkg/apis/apps/v1"
+package v1
diff --git a/pkg/apis/apps/v1beta1/doc.go b/pkg/apis/apps/v1beta1/doc.go
index 0a660311a27..52d63848dca 100644
--- a/pkg/apis/apps/v1beta1/doc.go
+++ b/pkg/apis/apps/v1beta1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:defaulter-gen-input=k8s.io/api/apps/v1beta1
 
-package v1beta1 // import "k8s.io/kubernetes/pkg/apis/apps/v1beta1"
+package v1beta1
diff --git a/pkg/apis/apps/v1beta2/doc.go b/pkg/apis/apps/v1beta2/doc.go
index fbc652dbaee..02896cb863a 100644
--- a/pkg/apis/apps/v1beta2/doc.go
+++ b/pkg/apis/apps/v1beta2/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:defaulter-gen-input=k8s.io/api/apps/v1beta2
 
-package v1beta2 // import "k8s.io/kubernetes/pkg/apis/apps/v1beta2"
+package v1beta2
diff --git a/pkg/apis/authentication/doc.go b/pkg/apis/authentication/doc.go
index b86561616ec..a57740b088e 100644
--- a/pkg/apis/authentication/doc.go
+++ b/pkg/apis/authentication/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +groupName=authentication.k8s.io
 
-package authentication // import "k8s.io/kubernetes/pkg/apis/authentication"
+package authentication
diff --git a/pkg/apis/authentication/v1/doc.go b/pkg/apis/authentication/v1/doc.go
index a53c4d6ddfd..c501febff85 100644
--- a/pkg/apis/authentication/v1/doc.go
+++ b/pkg/apis/authentication/v1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:defaulter-gen-input=k8s.io/api/authentication/v1
 
-package v1 // import "k8s.io/kubernetes/pkg/apis/authentication/v1"
+package v1
diff --git a/pkg/apis/authentication/v1alpha1/doc.go b/pkg/apis/authentication/v1alpha1/doc.go
index 1ac09a49c60..44087adce40 100644
--- a/pkg/apis/authentication/v1alpha1/doc.go
+++ b/pkg/apis/authentication/v1alpha1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:defaulter-gen-input=k8s.io/api/authentication/v1alpha1
 
-package v1alpha1 // import "k8s.io/kubernetes/pkg/apis/authentication/v1alpha1"
+package v1alpha1
diff --git a/pkg/apis/authentication/v1beta1/doc.go b/pkg/apis/authentication/v1beta1/doc.go
index 60dbc493ea0..05e9f3a999e 100644
--- a/pkg/apis/authentication/v1beta1/doc.go
+++ b/pkg/apis/authentication/v1beta1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:defaulter-gen-input=k8s.io/api/authentication/v1beta1
 
-package v1beta1 // import "k8s.io/kubernetes/pkg/apis/authentication/v1beta1"
+package v1beta1
diff --git a/pkg/apis/authorization/doc.go b/pkg/apis/authorization/doc.go
index 896049861f6..dd6e9124669 100644
--- a/pkg/apis/authorization/doc.go
+++ b/pkg/apis/authorization/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +groupName=authorization.k8s.io
 
-package authorization // import "k8s.io/kubernetes/pkg/apis/authorization"
+package authorization
diff --git a/pkg/apis/authorization/v1/doc.go b/pkg/apis/authorization/v1/doc.go
index ca90e9e0e7f..0d7d80aabc1 100644
--- a/pkg/apis/authorization/v1/doc.go
+++ b/pkg/apis/authorization/v1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=authorization.k8s.io
 
-package v1 // import "k8s.io/kubernetes/pkg/apis/authorization/v1"
+package v1
diff --git a/pkg/apis/authorization/v1beta1/doc.go b/pkg/apis/authorization/v1beta1/doc.go
index f67454aee45..fa81c6d534d 100644
--- a/pkg/apis/authorization/v1beta1/doc.go
+++ b/pkg/apis/authorization/v1beta1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=authorization.k8s.io
 
-package v1beta1 // import "k8s.io/kubernetes/pkg/apis/authorization/v1beta1"
+package v1beta1
diff --git a/pkg/apis/autoscaling/doc.go b/pkg/apis/autoscaling/doc.go
index 7c91aac8bb0..047eedde495 100644
--- a/pkg/apis/autoscaling/doc.go
+++ b/pkg/apis/autoscaling/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package autoscaling // import "k8s.io/kubernetes/pkg/apis/autoscaling"
+package autoscaling
diff --git a/pkg/apis/autoscaling/v1/doc.go b/pkg/apis/autoscaling/v1/doc.go
index 44229ea6b2f..06e48892a61 100644
--- a/pkg/apis/autoscaling/v1/doc.go
+++ b/pkg/apis/autoscaling/v1/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:defaulter-gen-input=k8s.io/api/autoscaling/v1
 
-package v1 // import "k8s.io/kubernetes/pkg/apis/autoscaling/v1"
+package v1
diff --git a/pkg/apis/autoscaling/v2/doc.go b/pkg/apis/autoscaling/v2/doc.go
index e508c7a5450..c21980b3307 100644
--- a/pkg/apis/autoscaling/v2/doc.go
+++ b/pkg/apis/autoscaling/v2/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:defaulter-gen-input=k8s.io/api/autoscaling/v2
 
-package v2 // import "k8s.io/kubernetes/pkg/apis/autoscaling/v2"
+package v2
diff --git a/pkg/apis/autoscaling/v2beta1/doc.go b/pkg/apis/autoscaling/v2beta1/doc.go
index 76790a29bdd..29163d3d3ed 100644
--- a/pkg/apis/autoscaling/v2beta1/doc.go
+++ b/pkg/apis/autoscaling/v2beta1/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:defaulter-gen-input=k8s.io/api/autoscaling/v2beta1
 
-package v2beta1 // import "k8s.io/kubernetes/pkg/apis/autoscaling/v2beta1"
+package v2beta1
diff --git a/pkg/apis/autoscaling/v2beta2/doc.go b/pkg/apis/autoscaling/v2beta2/doc.go
index 91c337a5eeb..c5d25c96563 100644
--- a/pkg/apis/autoscaling/v2beta2/doc.go
+++ b/pkg/apis/autoscaling/v2beta2/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:defaulter-gen-input=k8s.io/api/autoscaling/v2beta2
 
-package v2beta2 // import "k8s.io/kubernetes/pkg/apis/autoscaling/v2beta2"
+package v2beta2
diff --git a/pkg/apis/batch/doc.go b/pkg/apis/batch/doc.go
index a80b3597f23..65fa657f8f7 100644
--- a/pkg/apis/batch/doc.go
+++ b/pkg/apis/batch/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package batch // import "k8s.io/kubernetes/pkg/apis/batch"
+package batch
diff --git a/pkg/apis/batch/v1/doc.go b/pkg/apis/batch/v1/doc.go
index c6aafb6d66d..e9f50b40c19 100644
--- a/pkg/apis/batch/v1/doc.go
+++ b/pkg/apis/batch/v1/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:defaulter-gen-input=k8s.io/api/batch/v1
 
-package v1 // import "k8s.io/kubernetes/pkg/apis/batch/v1"
+package v1
diff --git a/pkg/apis/batch/v1beta1/doc.go b/pkg/apis/batch/v1beta1/doc.go
index db37207c0cc..93b344748df 100644
--- a/pkg/apis/batch/v1beta1/doc.go
+++ b/pkg/apis/batch/v1beta1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:defaulter-gen-input=k8s.io/api/batch/v1beta1
 
-package v1beta1 // import "k8s.io/kubernetes/pkg/apis/batch/v1beta1"
+package v1beta1
diff --git a/pkg/apis/certificates/doc.go b/pkg/apis/certificates/doc.go
index c752aacaf57..5d4ee99602e 100644
--- a/pkg/apis/certificates/doc.go
+++ b/pkg/apis/certificates/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +groupName=certificates.k8s.io
 
-package certificates // import "k8s.io/kubernetes/pkg/apis/certificates"
+package certificates
diff --git a/pkg/apis/certificates/v1/doc.go b/pkg/apis/certificates/v1/doc.go
index c09326b4305..966ab1e51b0 100644
--- a/pkg/apis/certificates/v1/doc.go
+++ b/pkg/apis/certificates/v1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=certificates.k8s.io
 
-package v1 // import "k8s.io/kubernetes/pkg/apis/certificates/v1"
+package v1
diff --git a/pkg/apis/certificates/v1alpha1/doc.go b/pkg/apis/certificates/v1alpha1/doc.go
index 0233e7f78f6..cfc87457896 100644
--- a/pkg/apis/certificates/v1alpha1/doc.go
+++ b/pkg/apis/certificates/v1alpha1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=certificates.k8s.io
 
-package v1alpha1 // import "k8s.io/kubernetes/pkg/apis/certificates/v1alpha1"
+package v1alpha1
diff --git a/pkg/apis/certificates/v1beta1/doc.go b/pkg/apis/certificates/v1beta1/doc.go
index 00186b2cc8a..4ad389e21b5 100644
--- a/pkg/apis/certificates/v1beta1/doc.go
+++ b/pkg/apis/certificates/v1beta1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=certificates.k8s.io
 
-package v1beta1 // import "k8s.io/kubernetes/pkg/apis/certificates/v1beta1"
+package v1beta1
diff --git a/pkg/apis/coordination/doc.go b/pkg/apis/coordination/doc.go
index 8cce2eda252..e912df22b98 100644
--- a/pkg/apis/coordination/doc.go
+++ b/pkg/apis/coordination/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 
 // +groupName=coordination.k8s.io
 
-package coordination // import "k8s.io/kubernetes/pkg/apis/coordination"
+package coordination
diff --git a/pkg/apis/coordination/v1/doc.go b/pkg/apis/coordination/v1/doc.go
index fa5c00fb3d8..5291570f81f 100644
--- a/pkg/apis/coordination/v1/doc.go
+++ b/pkg/apis/coordination/v1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=coordination.k8s.io
 
-package v1 // import "k8s.io/kubernetes/pkg/apis/coordination/v1"
+package v1
diff --git a/pkg/apis/coordination/v1alpha2/doc.go b/pkg/apis/coordination/v1alpha2/doc.go
index 73783d823d6..555e9aaed39 100644
--- a/pkg/apis/coordination/v1alpha2/doc.go
+++ b/pkg/apis/coordination/v1alpha2/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=coordination.k8s.io
 
-package v1alpha2 // import "k8s.io/kubernetes/pkg/apis/coordination/v1alpha2"
+package v1alpha2
diff --git a/pkg/apis/coordination/v1beta1/doc.go b/pkg/apis/coordination/v1beta1/doc.go
index 951c40d56d6..ce253b747a2 100644
--- a/pkg/apis/coordination/v1beta1/doc.go
+++ b/pkg/apis/coordination/v1beta1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=coordination.k8s.io
 
-package v1beta1 // import "k8s.io/kubernetes/pkg/apis/coordination/v1beta1"
+package v1beta1
diff --git a/pkg/apis/core/doc.go b/pkg/apis/core/doc.go
index 79ef0e05d56..555c961108e 100644
--- a/pkg/apis/core/doc.go
+++ b/pkg/apis/core/doc.go
@@ -22,4 +22,4 @@ limitations under the License.
 // The contract presented to clients is located in the versioned packages,
 // which are sub-directories. The first one is "v1". Those packages
 // describe how a particular version is serialized to storage/network.
-package core // import "k8s.io/kubernetes/pkg/apis/core"
+package core
diff --git a/pkg/apis/core/v1/doc.go b/pkg/apis/core/v1/doc.go
index 2dc9f4c5048..af7c0a8492e 100644
--- a/pkg/apis/core/v1/doc.go
+++ b/pkg/apis/core/v1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:defaulter-gen-input=k8s.io/api/core/v1
 
 // Package v1 is the v1 version of the API.
-package v1 // import "k8s.io/kubernetes/pkg/apis/core/v1"
+package v1
diff --git a/pkg/apis/core/validation/doc.go b/pkg/apis/core/validation/doc.go
index 0c1cfaab5a7..f17a15cf9c1 100644
--- a/pkg/apis/core/validation/doc.go
+++ b/pkg/apis/core/validation/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package validation has functions for validating the correctness of api
 // objects and explaining what is wrong with them when they aren't valid.
-package validation // import "k8s.io/kubernetes/pkg/apis/core/validation"
+package validation
diff --git a/pkg/apis/discovery/v1/doc.go b/pkg/apis/discovery/v1/doc.go
index 96243473ff2..83d3f4ab281 100644
--- a/pkg/apis/discovery/v1/doc.go
+++ b/pkg/apis/discovery/v1/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:defaulter-gen-input=k8s.io/api/discovery/v1
 
-package v1 // import "k8s.io/kubernetes/pkg/apis/discovery/v1"
+package v1
diff --git a/pkg/apis/discovery/v1beta1/doc.go b/pkg/apis/discovery/v1beta1/doc.go
index 2cddd16dca6..fbd710a604b 100644
--- a/pkg/apis/discovery/v1beta1/doc.go
+++ b/pkg/apis/discovery/v1beta1/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:defaulter-gen-input=k8s.io/api/discovery/v1beta1
 
-package v1beta1 // import "k8s.io/kubernetes/pkg/apis/discovery/v1beta1"
+package v1beta1
diff --git a/pkg/apis/events/doc.go b/pkg/apis/events/doc.go
index a2a963f7fcb..3ba3d5e7d7d 100644
--- a/pkg/apis/events/doc.go
+++ b/pkg/apis/events/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +groupName=events.k8s.io
 
-package events // import "k8s.io/kubernetes/pkg/apis/events"
+package events
diff --git a/pkg/apis/events/v1/doc.go b/pkg/apis/events/v1/doc.go
index 6bbbd94d520..86d0b712e76 100644
--- a/pkg/apis/events/v1/doc.go
+++ b/pkg/apis/events/v1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=events.k8s.io
 
-package v1 // import "k8s.io/kubernetes/pkg/apis/events/v1"
+package v1
diff --git a/pkg/apis/events/v1beta1/doc.go b/pkg/apis/events/v1beta1/doc.go
index dab7736e951..c6c243245e2 100644
--- a/pkg/apis/events/v1beta1/doc.go
+++ b/pkg/apis/events/v1beta1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=events.k8s.io
 
-package v1beta1 // import "k8s.io/kubernetes/pkg/apis/events/v1beta1"
+package v1beta1
diff --git a/pkg/apis/extensions/doc.go b/pkg/apis/extensions/doc.go
index d97cffdbcb2..a48d5d27929 100644
--- a/pkg/apis/extensions/doc.go
+++ b/pkg/apis/extensions/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package extensions // import "k8s.io/kubernetes/pkg/apis/extensions"
+package extensions
diff --git a/pkg/apis/extensions/v1beta1/doc.go b/pkg/apis/extensions/v1beta1/doc.go
index 7e65ac71cce..da2e07ff4a5 100644
--- a/pkg/apis/extensions/v1beta1/doc.go
+++ b/pkg/apis/extensions/v1beta1/doc.go
@@ -23,4 +23,4 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:defaulter-gen-input=k8s.io/api/extensions/v1beta1
 
-package v1beta1 // import "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
+package v1beta1
diff --git a/pkg/apis/flowcontrol/doc.go b/pkg/apis/flowcontrol/doc.go
index 33730efe58c..aba5757ced5 100644
--- a/pkg/apis/flowcontrol/doc.go
+++ b/pkg/apis/flowcontrol/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +groupName=flowcontrol.apiserver.k8s.io
 
 // Package flowcontrol provides api definitions for the "flowcontrol.apiserver.k8s.io" api group.
-package flowcontrol // import "k8s.io/kubernetes/pkg/apis/flowcontrol"
+package flowcontrol
diff --git a/pkg/apis/flowcontrol/v1/doc.go b/pkg/apis/flowcontrol/v1/doc.go
index b35cfdcb1cc..cf32c99fc7f 100644
--- a/pkg/apis/flowcontrol/v1/doc.go
+++ b/pkg/apis/flowcontrol/v1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=flowcontrol.apiserver.k8s.io
 
-package v1 // import "k8s.io/kubernetes/pkg/apis/flowcontrol/v1"
+package v1
diff --git a/pkg/apis/flowcontrol/v1beta1/doc.go b/pkg/apis/flowcontrol/v1beta1/doc.go
index cbced4e6ccc..e4d5cebebc2 100644
--- a/pkg/apis/flowcontrol/v1beta1/doc.go
+++ b/pkg/apis/flowcontrol/v1beta1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=flowcontrol.apiserver.k8s.io
 
-package v1beta1 // import "k8s.io/kubernetes/pkg/apis/flowcontrol/v1beta1"
+package v1beta1
diff --git a/pkg/apis/flowcontrol/v1beta2/doc.go b/pkg/apis/flowcontrol/v1beta2/doc.go
index 9a5f82fb864..7f38044a8cc 100644
--- a/pkg/apis/flowcontrol/v1beta2/doc.go
+++ b/pkg/apis/flowcontrol/v1beta2/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=flowcontrol.apiserver.k8s.io
 
-package v1beta2 // import "k8s.io/kubernetes/pkg/apis/flowcontrol/v1beta2"
+package v1beta2
diff --git a/pkg/apis/flowcontrol/v1beta3/doc.go b/pkg/apis/flowcontrol/v1beta3/doc.go
index 5ba8cbf3e97..24081d457af 100644
--- a/pkg/apis/flowcontrol/v1beta3/doc.go
+++ b/pkg/apis/flowcontrol/v1beta3/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=flowcontrol.apiserver.k8s.io
 
-package v1beta3 // import "k8s.io/kubernetes/pkg/apis/flowcontrol/v1beta3"
+package v1beta3
diff --git a/pkg/apis/imagepolicy/doc.go b/pkg/apis/imagepolicy/doc.go
index bfcdee2a481..543dbadfe8d 100644
--- a/pkg/apis/imagepolicy/doc.go
+++ b/pkg/apis/imagepolicy/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +groupName=imagepolicy.k8s.io
 
-package imagepolicy // import "k8s.io/kubernetes/pkg/apis/imagepolicy"
+package imagepolicy
diff --git a/pkg/apis/imagepolicy/v1alpha1/doc.go b/pkg/apis/imagepolicy/v1alpha1/doc.go
index ee89ed219d1..7ffdb59c418 100644
--- a/pkg/apis/imagepolicy/v1alpha1/doc.go
+++ b/pkg/apis/imagepolicy/v1alpha1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=imagepolicy.k8s.io
 
-package v1alpha1 // import "k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1"
+package v1alpha1
diff --git a/pkg/apis/networking/doc.go b/pkg/apis/networking/doc.go
index 218cd6c2f78..a26b8a07fee 100644
--- a/pkg/apis/networking/doc.go
+++ b/pkg/apis/networking/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +groupName=networking.k8s.io
 
-package networking // import "k8s.io/kubernetes/pkg/apis/networking"
+package networking
diff --git a/pkg/apis/networking/v1/doc.go b/pkg/apis/networking/v1/doc.go
index 763495d338f..36d390fe889 100644
--- a/pkg/apis/networking/v1/doc.go
+++ b/pkg/apis/networking/v1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 // +k8s:defaulter-gen-input=k8s.io/api/networking/v1
 // +groupName=networking.k8s.io
 
-package v1 // import "k8s.io/kubernetes/pkg/apis/networking/v1"
+package v1
diff --git a/pkg/apis/networking/v1alpha1/doc.go b/pkg/apis/networking/v1alpha1/doc.go
index 8f7931ecefc..992ce5541c5 100644
--- a/pkg/apis/networking/v1alpha1/doc.go
+++ b/pkg/apis/networking/v1alpha1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:defaulter-gen-input=k8s.io/api/networking/v1alpha1
 // +groupName=networking.k8s.io
 
-package v1alpha1 // import "k8s.io/kubernetes/pkg/apis/networking/v1alpha1"
+package v1alpha1
diff --git a/pkg/apis/networking/v1beta1/doc.go b/pkg/apis/networking/v1beta1/doc.go
index 72ad2ef46f0..914234d39e2 100644
--- a/pkg/apis/networking/v1beta1/doc.go
+++ b/pkg/apis/networking/v1beta1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 // +k8s:defaulter-gen-input=k8s.io/api/networking/v1beta1
 // +groupName=networking.k8s.io
 
-package v1beta1 // import "k8s.io/kubernetes/pkg/apis/networking/v1beta1"
+package v1beta1
diff --git a/pkg/apis/node/doc.go b/pkg/apis/node/doc.go
index 639d61262a6..5c336a97fa6 100644
--- a/pkg/apis/node/doc.go
+++ b/pkg/apis/node/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +groupName=node.k8s.io
 
-package node // import "k8s.io/kubernetes/pkg/apis/node"
+package node
diff --git a/pkg/apis/node/v1/doc.go b/pkg/apis/node/v1/doc.go
index 1eb5f2fd040..6ce4ae903b1 100644
--- a/pkg/apis/node/v1/doc.go
+++ b/pkg/apis/node/v1/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 
 // +groupName=node.k8s.io
 
-package v1 // import "k8s.io/kubernetes/pkg/apis/node/v1"
+package v1
diff --git a/pkg/apis/node/v1alpha1/doc.go b/pkg/apis/node/v1alpha1/doc.go
index 1c2e1431952..5bc302941a2 100644
--- a/pkg/apis/node/v1alpha1/doc.go
+++ b/pkg/apis/node/v1alpha1/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 
 // +groupName=node.k8s.io
 
-package v1alpha1 // import "k8s.io/kubernetes/pkg/apis/node/v1alpha1"
+package v1alpha1
diff --git a/pkg/apis/node/v1beta1/doc.go b/pkg/apis/node/v1beta1/doc.go
index 5883bc50503..7f6a5923acf 100644
--- a/pkg/apis/node/v1beta1/doc.go
+++ b/pkg/apis/node/v1beta1/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 
 // +groupName=node.k8s.io
 
-package v1beta1 // import "k8s.io/kubernetes/pkg/apis/node/v1beta1"
+package v1beta1
diff --git a/pkg/apis/policy/doc.go b/pkg/apis/policy/doc.go
index e8e081e7a3c..eb1342d30b6 100644
--- a/pkg/apis/policy/doc.go
+++ b/pkg/apis/policy/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package policy // import "k8s.io/kubernetes/pkg/apis/policy"
+package policy
diff --git a/pkg/apis/policy/v1/doc.go b/pkg/apis/policy/v1/doc.go
index aeb7667d2fb..e14ec11b411 100644
--- a/pkg/apis/policy/v1/doc.go
+++ b/pkg/apis/policy/v1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // Package policy is for any kind of policy object. Currently, this only
 // includes policyv1.PodDisruptionBudget
-package v1 // import "k8s.io/kubernetes/pkg/apis/policy/v1"
+package v1
diff --git a/pkg/apis/policy/v1beta1/doc.go b/pkg/apis/policy/v1beta1/doc.go
index 75fa12d7426..9d960829ee2 100644
--- a/pkg/apis/policy/v1beta1/doc.go
+++ b/pkg/apis/policy/v1beta1/doc.go
@@ -22,4 +22,4 @@ limitations under the License.
 // Package policy is for any kind of policy object.  Suitable examples, even if
 // they aren't all here, are policyv1beta1.PodDisruptionBudget,
 // NetworkPolicy, etc.
-package v1beta1 // import "k8s.io/kubernetes/pkg/apis/policy/v1beta1"
+package v1beta1
diff --git a/pkg/apis/rbac/doc.go b/pkg/apis/rbac/doc.go
index ea2309eea74..77ad4908d43 100644
--- a/pkg/apis/rbac/doc.go
+++ b/pkg/apis/rbac/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +groupName=rbac.authorization.k8s.io
 
-package rbac // import "k8s.io/kubernetes/pkg/apis/rbac"
+package rbac
diff --git a/pkg/apis/rbac/v1/doc.go b/pkg/apis/rbac/v1/doc.go
index ceed839b70f..ab4d3071384 100644
--- a/pkg/apis/rbac/v1/doc.go
+++ b/pkg/apis/rbac/v1/doc.go
@@ -22,4 +22,4 @@ limitations under the License.
 
 // +groupName=rbac.authorization.k8s.io
 
-package v1 // import "k8s.io/kubernetes/pkg/apis/rbac/v1"
+package v1
diff --git a/pkg/apis/rbac/v1alpha1/doc.go b/pkg/apis/rbac/v1alpha1/doc.go
index 3d68009ef67..77246de7585 100644
--- a/pkg/apis/rbac/v1alpha1/doc.go
+++ b/pkg/apis/rbac/v1alpha1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=rbac.authorization.k8s.io
 
-package v1alpha1 // import "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1"
+package v1alpha1
diff --git a/pkg/apis/rbac/v1beta1/doc.go b/pkg/apis/rbac/v1beta1/doc.go
index 8ff9ee11d15..b3474dc74b5 100644
--- a/pkg/apis/rbac/v1beta1/doc.go
+++ b/pkg/apis/rbac/v1beta1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=rbac.authorization.k8s.io
 
-package v1beta1 // import "k8s.io/kubernetes/pkg/apis/rbac/v1beta1"
+package v1beta1
diff --git a/pkg/apis/resource/doc.go b/pkg/apis/resource/doc.go
index f798bef1f94..173ed9f4aa7 100644
--- a/pkg/apis/resource/doc.go
+++ b/pkg/apis/resource/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 
 // Package resource contains the latest (or "internal") version of the
 // Kubernetes resource API objects.
-package resource // import "k8s.io/kubernetes/pkg/apis/resource"
+package resource
diff --git a/pkg/apis/resource/v1alpha3/doc.go b/pkg/apis/resource/v1alpha3/doc.go
index 9538510c7ba..2193bfc0b88 100644
--- a/pkg/apis/resource/v1alpha3/doc.go
+++ b/pkg/apis/resource/v1alpha3/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:defaulter-gen-input=k8s.io/api/resource/v1alpha3
 
 // Package v1alpha3 is the v1alpha3 version of the resource API.
-package v1alpha3 // import "k8s.io/kubernetes/pkg/apis/resource/v1alpha3"
+package v1alpha3
diff --git a/pkg/apis/resource/v1beta1/doc.go b/pkg/apis/resource/v1beta1/doc.go
index 17b8486d43c..f014667f8da 100644
--- a/pkg/apis/resource/v1beta1/doc.go
+++ b/pkg/apis/resource/v1beta1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:defaulter-gen-input=k8s.io/api/resource/v1beta1
 
 // Package v1beta1 is the v1beta1 version of the resource API.
-package v1beta1 // import "k8s.io/kubernetes/pkg/apis/resource/v1beta1"
+package v1beta1
diff --git a/pkg/apis/scheduling/doc.go b/pkg/apis/scheduling/doc.go
index bab0ae332af..399bb1e1bf9 100644
--- a/pkg/apis/scheduling/doc.go
+++ b/pkg/apis/scheduling/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +groupName=scheduling.k8s.io
 
-package scheduling // import "k8s.io/kubernetes/pkg/apis/scheduling"
+package scheduling
diff --git a/pkg/apis/scheduling/v1/doc.go b/pkg/apis/scheduling/v1/doc.go
index dd8b7486936..0ec810ed4ec 100644
--- a/pkg/apis/scheduling/v1/doc.go
+++ b/pkg/apis/scheduling/v1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:defaulter-gen-input=k8s.io/api/scheduling/v1
 
-package v1 // import "k8s.io/kubernetes/pkg/apis/scheduling/v1"
+package v1
diff --git a/pkg/apis/scheduling/v1alpha1/doc.go b/pkg/apis/scheduling/v1alpha1/doc.go
index 82194ba8824..db092377a27 100644
--- a/pkg/apis/scheduling/v1alpha1/doc.go
+++ b/pkg/apis/scheduling/v1alpha1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:defaulter-gen-input=k8s.io/api/scheduling/v1alpha1
 
-package v1alpha1 // import "k8s.io/kubernetes/pkg/apis/scheduling/v1alpha1"
+package v1alpha1
diff --git a/pkg/apis/scheduling/v1beta1/doc.go b/pkg/apis/scheduling/v1beta1/doc.go
index 580f5551240..a90d1825417 100644
--- a/pkg/apis/scheduling/v1beta1/doc.go
+++ b/pkg/apis/scheduling/v1beta1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:defaulter-gen-input=k8s.io/api/scheduling/v1beta1
 
-package v1beta1 // import "k8s.io/kubernetes/pkg/apis/scheduling/v1beta1"
+package v1beta1
diff --git a/pkg/apis/storage/doc.go b/pkg/apis/storage/doc.go
index 52b2c2d822c..769e29e69de 100644
--- a/pkg/apis/storage/doc.go
+++ b/pkg/apis/storage/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +groupName=storage.k8s.io
 
-package storage // import "k8s.io/kubernetes/pkg/apis/storage"
+package storage
diff --git a/pkg/apis/storage/v1/doc.go b/pkg/apis/storage/v1/doc.go
index 0bb97d8a650..455fd010a1f 100644
--- a/pkg/apis/storage/v1/doc.go
+++ b/pkg/apis/storage/v1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:defaulter-gen-input=k8s.io/api/storage/v1
 
-package v1 // import "k8s.io/kubernetes/pkg/apis/storage/v1"
+package v1
diff --git a/pkg/apis/storage/v1alpha1/doc.go b/pkg/apis/storage/v1alpha1/doc.go
index 34925a851a3..e0e102acc6c 100644
--- a/pkg/apis/storage/v1alpha1/doc.go
+++ b/pkg/apis/storage/v1alpha1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:defaulter-gen-input=k8s.io/api/storage/v1alpha1
 
-package v1alpha1 // import "k8s.io/kubernetes/pkg/apis/storage/v1alpha1"
+package v1alpha1
diff --git a/pkg/apis/storage/v1beta1/doc.go b/pkg/apis/storage/v1beta1/doc.go
index 9cb45134351..60f550386b2 100644
--- a/pkg/apis/storage/v1beta1/doc.go
+++ b/pkg/apis/storage/v1beta1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:defaulter-gen-input=k8s.io/api/storage/v1beta1
 
-package v1beta1 // import "k8s.io/kubernetes/pkg/apis/storage/v1beta1"
+package v1beta1
diff --git a/pkg/apis/storagemigration/doc.go b/pkg/apis/storagemigration/doc.go
index 973b88943e8..15cafbb610e 100644
--- a/pkg/apis/storagemigration/doc.go
+++ b/pkg/apis/storagemigration/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +groupName=storagemigration.k8s.io
 
-package storagemigration // import "k8s.io/kubernetes/pkg/apis/storagemigration"
+package storagemigration
diff --git a/pkg/apis/storagemigration/v1alpha1/doc.go b/pkg/apis/storagemigration/v1alpha1/doc.go
index b3b605b5258..67db57a3b54 100644
--- a/pkg/apis/storagemigration/v1alpha1/doc.go
+++ b/pkg/apis/storagemigration/v1alpha1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:defaulter-gen-input=k8s.io/api/storagemigration/v1alpha1
 
-package v1alpha1 // import "k8s.io/kubernetes/pkg/apis/storagemigration/v1alpha1"
+package v1alpha1
diff --git a/pkg/capabilities/doc.go b/pkg/capabilities/doc.go
index e8d3aa3e52d..68db7faa24a 100644
--- a/pkg/capabilities/doc.go
+++ b/pkg/capabilities/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package capabilities manages system level capabilities
-package capabilities // import "k8s.io/kubernetes/pkg/capabilities"
+package capabilities
diff --git a/pkg/cluster/ports/doc.go b/pkg/cluster/ports/doc.go
index 0810294e0d4..a2a002101ca 100644
--- a/pkg/cluster/ports/doc.go
+++ b/pkg/cluster/ports/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package ports defines ports used by various pieces of the kubernetes
 // infrastructure.
-package ports // import "k8s.io/kubernetes/pkg/cluster/ports"
+package ports
diff --git a/pkg/controller/apis/config/doc.go b/pkg/controller/apis/config/doc.go
index c44cb82e163..a06a258eb3f 100644
--- a/pkg/controller/apis/config/doc.go
+++ b/pkg/controller/apis/config/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package config // import "k8s.io/kubernetes/pkg/controller/apis/config"
+package config
diff --git a/pkg/controller/apis/config/v1alpha1/doc.go b/pkg/controller/apis/config/v1alpha1/doc.go
index 15c2ecf4c80..37dbb190477 100644
--- a/pkg/controller/apis/config/v1alpha1/doc.go
+++ b/pkg/controller/apis/config/v1alpha1/doc.go
@@ -48,4 +48,4 @@ limitations under the License.
 // +k8s:defaulter-gen-input=k8s.io/kube-controller-manager/config/v1alpha1
 // +groupName=kubecontrollermanager.config.k8s.io
 
-package v1alpha1 // import "k8s.io/kubernetes/pkg/controller/apis/config/v1alpha1"
+package v1alpha1
diff --git a/pkg/controller/bootstrap/doc.go b/pkg/controller/bootstrap/doc.go
index c548cec54e5..ce92c0b40ab 100644
--- a/pkg/controller/bootstrap/doc.go
+++ b/pkg/controller/bootstrap/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // Package bootstrap provides automatic processes necessary for bootstraping.
 // This includes managing and expiring tokens along with signing well known
 // configmaps with those tokens.
-package bootstrap // import "k8s.io/kubernetes/pkg/controller/bootstrap"
+package bootstrap
diff --git a/pkg/controller/certificates/signer/config/doc.go b/pkg/controller/certificates/signer/config/doc.go
index aab34b1759d..164ec715bb4 100644
--- a/pkg/controller/certificates/signer/config/doc.go
+++ b/pkg/controller/certificates/signer/config/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package config // import "k8s.io/kubernetes/pkg/controller/certificates/signer/config"
+package config
diff --git a/pkg/controller/certificates/signer/config/v1alpha1/doc.go b/pkg/controller/certificates/signer/config/v1alpha1/doc.go
index 1b87ddd52b5..8576e2615d9 100644
--- a/pkg/controller/certificates/signer/config/v1alpha1/doc.go
+++ b/pkg/controller/certificates/signer/config/v1alpha1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/certificates/signer/config
 // +k8s:conversion-gen-external-types=k8s.io/kube-controller-manager/config/v1alpha1
 
-package v1alpha1 // import "k8s.io/kubernetes/pkg/controller/certificates/signer/config/v1alpha1"
+package v1alpha1
diff --git a/pkg/controller/cronjob/config/doc.go b/pkg/controller/cronjob/config/doc.go
index f5d5ba18735..919c3093d7a 100644
--- a/pkg/controller/cronjob/config/doc.go
+++ b/pkg/controller/cronjob/config/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package config // import "k8s.io/kubernetes/pkg/controller/cronjob/config"
+package config
diff --git a/pkg/controller/cronjob/config/v1alpha1/doc.go b/pkg/controller/cronjob/config/v1alpha1/doc.go
index 7a66b80104e..6febdecdcf7 100644
--- a/pkg/controller/cronjob/config/v1alpha1/doc.go
+++ b/pkg/controller/cronjob/config/v1alpha1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/cronjob/config
 // +k8s:conversion-gen-external-types=k8s.io/kube-controller-manager/config/v1alpha1
 
-package v1alpha1 // import "k8s.io/kubernetes/pkg/controller/cronjob/config/v1alpha1"
+package v1alpha1
diff --git a/pkg/controller/daemon/config/doc.go b/pkg/controller/daemon/config/doc.go
index b88b2cd6271..164ec715bb4 100644
--- a/pkg/controller/daemon/config/doc.go
+++ b/pkg/controller/daemon/config/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package config // import "k8s.io/kubernetes/pkg/controller/daemon/config"
+package config
diff --git a/pkg/controller/daemon/config/v1alpha1/doc.go b/pkg/controller/daemon/config/v1alpha1/doc.go
index 1e9952af0d3..46d48ebec41 100644
--- a/pkg/controller/daemon/config/v1alpha1/doc.go
+++ b/pkg/controller/daemon/config/v1alpha1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/daemon/config
 // +k8s:conversion-gen-external-types=k8s.io/kube-controller-manager/config/v1alpha1
 
-package v1alpha1 // import "k8s.io/kubernetes/pkg/controller/daemon/config/v1alpha1"
+package v1alpha1
diff --git a/pkg/controller/daemon/doc.go b/pkg/controller/daemon/doc.go
index 571e64422a7..9a5190a29b3 100644
--- a/pkg/controller/daemon/doc.go
+++ b/pkg/controller/daemon/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package daemon contains logic for watching and synchronizing
 // daemons.
-package daemon // import "k8s.io/kubernetes/pkg/controller/daemon"
+package daemon
diff --git a/pkg/controller/deployment/config/doc.go b/pkg/controller/deployment/config/doc.go
index 3eeb1fe2391..164ec715bb4 100644
--- a/pkg/controller/deployment/config/doc.go
+++ b/pkg/controller/deployment/config/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package config // import "k8s.io/kubernetes/pkg/controller/deployment/config"
+package config
diff --git a/pkg/controller/deployment/config/v1alpha1/doc.go b/pkg/controller/deployment/config/v1alpha1/doc.go
index 4e82b3a9a23..bcc8a471d59 100644
--- a/pkg/controller/deployment/config/v1alpha1/doc.go
+++ b/pkg/controller/deployment/config/v1alpha1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/deployment/config
 // +k8s:conversion-gen-external-types=k8s.io/kube-controller-manager/config/v1alpha1
 
-package v1alpha1 // import "k8s.io/kubernetes/pkg/controller/deployment/config/v1alpha1"
+package v1alpha1
diff --git a/pkg/controller/doc.go b/pkg/controller/doc.go
index 3c5c943da8d..ded3905820e 100644
--- a/pkg/controller/doc.go
+++ b/pkg/controller/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package controller contains code for controllers (like the replication
 // controller).
-package controller // import "k8s.io/kubernetes/pkg/controller"
+package controller
diff --git a/pkg/controller/endpoint/config/doc.go b/pkg/controller/endpoint/config/doc.go
index c9ed7db844d..164ec715bb4 100644
--- a/pkg/controller/endpoint/config/doc.go
+++ b/pkg/controller/endpoint/config/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package config // import "k8s.io/kubernetes/pkg/controller/endpoint/config"
+package config
diff --git a/pkg/controller/endpoint/config/v1alpha1/doc.go b/pkg/controller/endpoint/config/v1alpha1/doc.go
index 6265b0267ee..bc18b2ba046 100644
--- a/pkg/controller/endpoint/config/v1alpha1/doc.go
+++ b/pkg/controller/endpoint/config/v1alpha1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/endpoint/config
 // +k8s:conversion-gen-external-types=k8s.io/kube-controller-manager/config/v1alpha1
 
-package v1alpha1 // import "k8s.io/kubernetes/pkg/controller/endpoint/config/v1alpha1"
+package v1alpha1
diff --git a/pkg/controller/endpoint/doc.go b/pkg/controller/endpoint/doc.go
index dbd3d1045d3..a771dc6518e 100644
--- a/pkg/controller/endpoint/doc.go
+++ b/pkg/controller/endpoint/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package endpoint provides EndpointController implementation
 // to manage and sync service endpoints.
-package endpoint // import "k8s.io/kubernetes/pkg/controller/endpoint"
+package endpoint
diff --git a/pkg/controller/endpointslice/config/doc.go b/pkg/controller/endpointslice/config/doc.go
index fa47f0db09a..164ec715bb4 100644
--- a/pkg/controller/endpointslice/config/doc.go
+++ b/pkg/controller/endpointslice/config/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package config // import "k8s.io/kubernetes/pkg/controller/endpointslice/config"
+package config
diff --git a/pkg/controller/endpointslice/config/v1alpha1/doc.go b/pkg/controller/endpointslice/config/v1alpha1/doc.go
index 2ef2a1fee4b..e9efc5972d1 100644
--- a/pkg/controller/endpointslice/config/v1alpha1/doc.go
+++ b/pkg/controller/endpointslice/config/v1alpha1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/endpointslice/config
 // +k8s:conversion-gen-external-types=k8s.io/kube-controller-manager/config/v1alpha1
 
-package v1alpha1 // import "k8s.io/kubernetes/pkg/controller/endpointslice/config/v1alpha1"
+package v1alpha1
diff --git a/pkg/controller/endpointslicemirroring/config/doc.go b/pkg/controller/endpointslicemirroring/config/doc.go
index 358fba10177..919c3093d7a 100644
--- a/pkg/controller/endpointslicemirroring/config/doc.go
+++ b/pkg/controller/endpointslicemirroring/config/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package config // import "k8s.io/kubernetes/pkg/controller/endpointslicemirroring/config"
+package config
diff --git a/pkg/controller/endpointslicemirroring/config/v1alpha1/doc.go b/pkg/controller/endpointslicemirroring/config/v1alpha1/doc.go
index 9a99542d5d8..23febb6262d 100644
--- a/pkg/controller/endpointslicemirroring/config/v1alpha1/doc.go
+++ b/pkg/controller/endpointslicemirroring/config/v1alpha1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/endpointslicemirroring/config
 // +k8s:conversion-gen-external-types=k8s.io/kube-controller-manager/config/v1alpha1
 
-package v1alpha1 // import "k8s.io/kubernetes/pkg/controller/endpointslicemirroring/config/v1alpha1"
+package v1alpha1
diff --git a/pkg/controller/garbagecollector/config/doc.go b/pkg/controller/garbagecollector/config/doc.go
index 17aee603c36..164ec715bb4 100644
--- a/pkg/controller/garbagecollector/config/doc.go
+++ b/pkg/controller/garbagecollector/config/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package config // import "k8s.io/kubernetes/pkg/controller/garbagecollector/config"
+package config
diff --git a/pkg/controller/garbagecollector/config/v1alpha1/doc.go b/pkg/controller/garbagecollector/config/v1alpha1/doc.go
index 83f3b58bc87..f6e167bb244 100644
--- a/pkg/controller/garbagecollector/config/v1alpha1/doc.go
+++ b/pkg/controller/garbagecollector/config/v1alpha1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/garbagecollector/config
 // +k8s:conversion-gen-external-types=k8s.io/kube-controller-manager/config/v1alpha1
 
-package v1alpha1 // import "k8s.io/kubernetes/pkg/controller/garbagecollector/config/v1alpha1"
+package v1alpha1
diff --git a/pkg/controller/job/config/doc.go b/pkg/controller/job/config/doc.go
index 32a25a60495..164ec715bb4 100644
--- a/pkg/controller/job/config/doc.go
+++ b/pkg/controller/job/config/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package config // import "k8s.io/kubernetes/pkg/controller/job/config"
+package config
diff --git a/pkg/controller/job/config/v1alpha1/doc.go b/pkg/controller/job/config/v1alpha1/doc.go
index e159ef7233a..ec275116f00 100644
--- a/pkg/controller/job/config/v1alpha1/doc.go
+++ b/pkg/controller/job/config/v1alpha1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/job/config
 // +k8s:conversion-gen-external-types=k8s.io/kube-controller-manager/config/v1alpha1
 
-package v1alpha1 // import "k8s.io/kubernetes/pkg/controller/job/config/v1alpha1"
+package v1alpha1
diff --git a/pkg/controller/job/doc.go b/pkg/controller/job/doc.go
index e7219f33812..281ab9ad736 100644
--- a/pkg/controller/job/doc.go
+++ b/pkg/controller/job/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package job contains logic for watching and synchronizing jobs.
-package job // import "k8s.io/kubernetes/pkg/controller/job"
+package job
diff --git a/pkg/controller/namespace/config/doc.go b/pkg/controller/namespace/config/doc.go
index 0e2cb965d03..164ec715bb4 100644
--- a/pkg/controller/namespace/config/doc.go
+++ b/pkg/controller/namespace/config/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package config // import "k8s.io/kubernetes/pkg/controller/namespace/config"
+package config
diff --git a/pkg/controller/namespace/config/v1alpha1/doc.go b/pkg/controller/namespace/config/v1alpha1/doc.go
index 5d779f7a96b..f50c5cc4af7 100644
--- a/pkg/controller/namespace/config/v1alpha1/doc.go
+++ b/pkg/controller/namespace/config/v1alpha1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/namespace/config
 // +k8s:conversion-gen-external-types=k8s.io/kube-controller-manager/config/v1alpha1
 
-package v1alpha1 // import "k8s.io/kubernetes/pkg/controller/namespace/config/v1alpha1"
+package v1alpha1
diff --git a/pkg/controller/namespace/doc.go b/pkg/controller/namespace/doc.go
index 82885aa8c54..39547867860 100644
--- a/pkg/controller/namespace/doc.go
+++ b/pkg/controller/namespace/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package namespace contains a controller that handles namespace lifecycle
-package namespace // import "k8s.io/kubernetes/pkg/controller/namespace"
+package namespace
diff --git a/pkg/controller/nodeipam/config/doc.go b/pkg/controller/nodeipam/config/doc.go
index 3d3bee2cd5b..164ec715bb4 100644
--- a/pkg/controller/nodeipam/config/doc.go
+++ b/pkg/controller/nodeipam/config/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package config // import "k8s.io/kubernetes/pkg/controller/nodeipam/config"
+package config
diff --git a/pkg/controller/nodeipam/config/v1alpha1/doc.go b/pkg/controller/nodeipam/config/v1alpha1/doc.go
index ec75f19d6c9..8d7ed881a96 100644
--- a/pkg/controller/nodeipam/config/v1alpha1/doc.go
+++ b/pkg/controller/nodeipam/config/v1alpha1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/nodeipam/config
 // +k8s:conversion-gen-external-types=k8s.io/kube-controller-manager/config/v1alpha1
 
-package v1alpha1 // import "k8s.io/kubernetes/pkg/controller/nodeipam/config/v1alpha1"
+package v1alpha1
diff --git a/pkg/controller/nodeipam/doc.go b/pkg/controller/nodeipam/doc.go
index a7b2d12db8e..af4cd15c078 100644
--- a/pkg/controller/nodeipam/doc.go
+++ b/pkg/controller/nodeipam/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package nodeipam contains code for syncing cloud instances with
 // node registry
-package nodeipam // import "k8s.io/kubernetes/pkg/controller/nodeipam"
+package nodeipam
diff --git a/pkg/controller/nodelifecycle/config/doc.go b/pkg/controller/nodelifecycle/config/doc.go
index 63ae726eed3..164ec715bb4 100644
--- a/pkg/controller/nodelifecycle/config/doc.go
+++ b/pkg/controller/nodelifecycle/config/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package config // import "k8s.io/kubernetes/pkg/controller/nodelifecycle/config"
+package config
diff --git a/pkg/controller/nodelifecycle/config/v1alpha1/doc.go b/pkg/controller/nodelifecycle/config/v1alpha1/doc.go
index 60a727d4e3f..11c4492629f 100644
--- a/pkg/controller/nodelifecycle/config/v1alpha1/doc.go
+++ b/pkg/controller/nodelifecycle/config/v1alpha1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/nodelifecycle/config
 // +k8s:conversion-gen-external-types=k8s.io/kube-controller-manager/config/v1alpha1
 
-package v1alpha1 // import "k8s.io/kubernetes/pkg/controller/nodelifecycle/config/v1alpha1"
+package v1alpha1
diff --git a/pkg/controller/podautoscaler/config/doc.go b/pkg/controller/podautoscaler/config/doc.go
index 265f1f7ad61..164ec715bb4 100644
--- a/pkg/controller/podautoscaler/config/doc.go
+++ b/pkg/controller/podautoscaler/config/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package config // import "k8s.io/kubernetes/pkg/controller/podautoscaler/config"
+package config
diff --git a/pkg/controller/podautoscaler/config/v1alpha1/doc.go b/pkg/controller/podautoscaler/config/v1alpha1/doc.go
index 3bc53b14c14..c0edefb5009 100644
--- a/pkg/controller/podautoscaler/config/v1alpha1/doc.go
+++ b/pkg/controller/podautoscaler/config/v1alpha1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/podautoscaler/config
 // +k8s:conversion-gen-external-types=k8s.io/kube-controller-manager/config/v1alpha1
 
-package v1alpha1 // import "k8s.io/kubernetes/pkg/controller/podautoscaler/config/v1alpha1"
+package v1alpha1
diff --git a/pkg/controller/podautoscaler/doc.go b/pkg/controller/podautoscaler/doc.go
index b87957e4289..fbbf843b01b 100644
--- a/pkg/controller/podautoscaler/doc.go
+++ b/pkg/controller/podautoscaler/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package podautoscaler contains logic for autoscaling number of
 // pods based on metrics observed.
-package podautoscaler // import "k8s.io/kubernetes/pkg/controller/podautoscaler"
+package podautoscaler
diff --git a/pkg/controller/podgc/config/doc.go b/pkg/controller/podgc/config/doc.go
index 7df1d1ecc27..164ec715bb4 100644
--- a/pkg/controller/podgc/config/doc.go
+++ b/pkg/controller/podgc/config/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package config // import "k8s.io/kubernetes/pkg/controller/podgc/config"
+package config
diff --git a/pkg/controller/podgc/config/v1alpha1/doc.go b/pkg/controller/podgc/config/v1alpha1/doc.go
index 22cc808ad79..f496645234e 100644
--- a/pkg/controller/podgc/config/v1alpha1/doc.go
+++ b/pkg/controller/podgc/config/v1alpha1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/podgc/config
 // +k8s:conversion-gen-external-types=k8s.io/kube-controller-manager/config/v1alpha1
 
-package v1alpha1 // import "k8s.io/kubernetes/pkg/controller/podgc/config/v1alpha1"
+package v1alpha1
diff --git a/pkg/controller/podgc/doc.go b/pkg/controller/podgc/doc.go
index 4806c827a95..6a23ea63141 100644
--- a/pkg/controller/podgc/doc.go
+++ b/pkg/controller/podgc/doc.go
@@ -22,4 +22,4 @@ limitations under the License.
 // prioritizes pods to delete by sorting by creation timestamp and deleting the
 // oldest objects first. The PodGCController will not delete non-terminated
 // pods.
-package podgc // import "k8s.io/kubernetes/pkg/controller/podgc"
+package podgc
diff --git a/pkg/controller/replicaset/config/doc.go b/pkg/controller/replicaset/config/doc.go
index ec3a68f9d3d..164ec715bb4 100644
--- a/pkg/controller/replicaset/config/doc.go
+++ b/pkg/controller/replicaset/config/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package config // import "k8s.io/kubernetes/pkg/controller/replicaset/config"
+package config
diff --git a/pkg/controller/replicaset/config/v1alpha1/doc.go b/pkg/controller/replicaset/config/v1alpha1/doc.go
index a70fbaf6c63..7739de7aff1 100644
--- a/pkg/controller/replicaset/config/v1alpha1/doc.go
+++ b/pkg/controller/replicaset/config/v1alpha1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/replicaset/config
 // +k8s:conversion-gen-external-types=k8s.io/kube-controller-manager/config/v1alpha1
 
-package v1alpha1 // import "k8s.io/kubernetes/pkg/controller/replicaset/config/v1alpha1"
+package v1alpha1
diff --git a/pkg/controller/replicaset/doc.go b/pkg/controller/replicaset/doc.go
index 0770ac51720..d93c793804a 100644
--- a/pkg/controller/replicaset/doc.go
+++ b/pkg/controller/replicaset/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package replicaset contains logic for watching and synchronizing
 // ReplicaSets.
-package replicaset // import "k8s.io/kubernetes/pkg/controller/replicaset"
+package replicaset
diff --git a/pkg/controller/replication/config/doc.go b/pkg/controller/replication/config/doc.go
index 91b4d68134f..164ec715bb4 100644
--- a/pkg/controller/replication/config/doc.go
+++ b/pkg/controller/replication/config/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package config // import "k8s.io/kubernetes/pkg/controller/replication/config"
+package config
diff --git a/pkg/controller/replication/config/v1alpha1/doc.go b/pkg/controller/replication/config/v1alpha1/doc.go
index e5d1090a029..48497e443e6 100644
--- a/pkg/controller/replication/config/v1alpha1/doc.go
+++ b/pkg/controller/replication/config/v1alpha1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/replication/config
 // +k8s:conversion-gen-external-types=k8s.io/kube-controller-manager/config/v1alpha1
 
-package v1alpha1 // import "k8s.io/kubernetes/pkg/controller/replication/config/v1alpha1"
+package v1alpha1
diff --git a/pkg/controller/replication/doc.go b/pkg/controller/replication/doc.go
index cf36f61eac5..eb0f42158f1 100644
--- a/pkg/controller/replication/doc.go
+++ b/pkg/controller/replication/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package replication contains logic for watching and synchronizing
 // replication controllers.
-package replication // import "k8s.io/kubernetes/pkg/controller/replication"
+package replication
diff --git a/pkg/controller/resourcequota/config/doc.go b/pkg/controller/resourcequota/config/doc.go
index 26f37a3aeaf..164ec715bb4 100644
--- a/pkg/controller/resourcequota/config/doc.go
+++ b/pkg/controller/resourcequota/config/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package config // import "k8s.io/kubernetes/pkg/controller/resourcequota/config"
+package config
diff --git a/pkg/controller/resourcequota/config/v1alpha1/doc.go b/pkg/controller/resourcequota/config/v1alpha1/doc.go
index 7a1f9e27750..a5de13bebd1 100644
--- a/pkg/controller/resourcequota/config/v1alpha1/doc.go
+++ b/pkg/controller/resourcequota/config/v1alpha1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/resourcequota/config
 // +k8s:conversion-gen-external-types=k8s.io/kube-controller-manager/config/v1alpha1
 
-package v1alpha1 // import "k8s.io/kubernetes/pkg/controller/resourcequota/config/v1alpha1"
+package v1alpha1
diff --git a/pkg/controller/resourcequota/doc.go b/pkg/controller/resourcequota/doc.go
index dcd090c47f7..f2217d876c0 100644
--- a/pkg/controller/resourcequota/doc.go
+++ b/pkg/controller/resourcequota/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package resourcequota contains a controller that makes resource quota usage observations
-package resourcequota // import "k8s.io/kubernetes/pkg/controller/resourcequota"
+package resourcequota
diff --git a/pkg/controller/serviceaccount/config/doc.go b/pkg/controller/serviceaccount/config/doc.go
index ac00fb6a4e5..164ec715bb4 100644
--- a/pkg/controller/serviceaccount/config/doc.go
+++ b/pkg/controller/serviceaccount/config/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package config // import "k8s.io/kubernetes/pkg/controller/serviceaccount/config"
+package config
diff --git a/pkg/controller/serviceaccount/config/v1alpha1/doc.go b/pkg/controller/serviceaccount/config/v1alpha1/doc.go
index 4f5543a433e..01302e43c6b 100644
--- a/pkg/controller/serviceaccount/config/v1alpha1/doc.go
+++ b/pkg/controller/serviceaccount/config/v1alpha1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/serviceaccount/config
 // +k8s:conversion-gen-external-types=k8s.io/kube-controller-manager/config/v1alpha1
 
-package v1alpha1 // import "k8s.io/kubernetes/pkg/controller/serviceaccount/config/v1alpha1"
+package v1alpha1
diff --git a/pkg/controller/serviceaccount/doc.go b/pkg/controller/serviceaccount/doc.go
index 9aa90632780..211796b1235 100644
--- a/pkg/controller/serviceaccount/doc.go
+++ b/pkg/controller/serviceaccount/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package serviceaccount provides implementations
 // to manage service accounts and service account tokens
-package serviceaccount // import "k8s.io/kubernetes/pkg/controller/serviceaccount"
+package serviceaccount
diff --git a/pkg/controller/statefulset/config/doc.go b/pkg/controller/statefulset/config/doc.go
index bd12cedd44b..164ec715bb4 100644
--- a/pkg/controller/statefulset/config/doc.go
+++ b/pkg/controller/statefulset/config/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package config // import "k8s.io/kubernetes/pkg/controller/statefulset/config"
+package config
diff --git a/pkg/controller/statefulset/config/v1alpha1/doc.go b/pkg/controller/statefulset/config/v1alpha1/doc.go
index cb474cd3aa4..be4d087ea98 100644
--- a/pkg/controller/statefulset/config/v1alpha1/doc.go
+++ b/pkg/controller/statefulset/config/v1alpha1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/statefulset/config
 // +k8s:conversion-gen-external-types=k8s.io/kube-controller-manager/config/v1alpha1
 
-package v1alpha1 // import "k8s.io/kubernetes/pkg/controller/statefulset/config/v1alpha1"
+package v1alpha1
diff --git a/pkg/controller/ttlafterfinished/config/doc.go b/pkg/controller/ttlafterfinished/config/doc.go
index 7e7ae300818..164ec715bb4 100644
--- a/pkg/controller/ttlafterfinished/config/doc.go
+++ b/pkg/controller/ttlafterfinished/config/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package config // import "k8s.io/kubernetes/pkg/controller/ttlafterfinished/config"
+package config
diff --git a/pkg/controller/ttlafterfinished/config/v1alpha1/doc.go b/pkg/controller/ttlafterfinished/config/v1alpha1/doc.go
index b017da2efba..13a883e6cb9 100644
--- a/pkg/controller/ttlafterfinished/config/v1alpha1/doc.go
+++ b/pkg/controller/ttlafterfinished/config/v1alpha1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/ttlafterfinished/config
 // +k8s:conversion-gen-external-types=k8s.io/kube-controller-manager/config/v1alpha1
 
-package v1alpha1 // import "k8s.io/kubernetes/pkg/controller/ttlafterfinished/config/v1alpha1"
+package v1alpha1
diff --git a/pkg/controller/validatingadmissionpolicystatus/config/doc.go b/pkg/controller/validatingadmissionpolicystatus/config/doc.go
index 9fc384bba0e..a8b0d9aadc8 100644
--- a/pkg/controller/validatingadmissionpolicystatus/config/doc.go
+++ b/pkg/controller/validatingadmissionpolicystatus/config/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package config // import "k8s.io/kubernetes/pkg/controller/validatingadmissionpolicystatus/config"
+package config
diff --git a/pkg/controller/validatingadmissionpolicystatus/config/v1alpha1/doc.go b/pkg/controller/validatingadmissionpolicystatus/config/v1alpha1/doc.go
index 9295a268e5e..0429852e4b9 100644
--- a/pkg/controller/validatingadmissionpolicystatus/config/v1alpha1/doc.go
+++ b/pkg/controller/validatingadmissionpolicystatus/config/v1alpha1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/validatingadmissionpolicystatus/config
 // +k8s:conversion-gen-external-types=k8s.io/kube-controller-manager/config/v1alpha1
 
-package v1alpha1 // import "k8s.io/kubernetes/pkg/controller/validatingadmissionpolicystatus/config/v1alpha1"
+package v1alpha1
diff --git a/pkg/controller/volume/attachdetach/config/doc.go b/pkg/controller/volume/attachdetach/config/doc.go
index 1e56cea88e0..164ec715bb4 100644
--- a/pkg/controller/volume/attachdetach/config/doc.go
+++ b/pkg/controller/volume/attachdetach/config/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package config // import "k8s.io/kubernetes/pkg/controller/volume/attachdetach/config"
+package config
diff --git a/pkg/controller/volume/attachdetach/config/v1alpha1/doc.go b/pkg/controller/volume/attachdetach/config/v1alpha1/doc.go
index 3b08df3f774..747b597d9e9 100644
--- a/pkg/controller/volume/attachdetach/config/v1alpha1/doc.go
+++ b/pkg/controller/volume/attachdetach/config/v1alpha1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/volume/attachdetach/config
 // +k8s:conversion-gen-external-types=k8s.io/kube-controller-manager/config/v1alpha1
 
-package v1alpha1 // import "k8s.io/kubernetes/pkg/controller/volume/attachdetach/config/v1alpha1"
+package v1alpha1
diff --git a/pkg/controller/volume/ephemeral/config/doc.go b/pkg/controller/volume/ephemeral/config/doc.go
index 01d52859902..d5115bb1e65 100644
--- a/pkg/controller/volume/ephemeral/config/doc.go
+++ b/pkg/controller/volume/ephemeral/config/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package config // import "k8s.io/kubernetes/pkg/controller/volume/ephemeral/config"
+package config
diff --git a/pkg/controller/volume/ephemeral/config/v1alpha1/doc.go b/pkg/controller/volume/ephemeral/config/v1alpha1/doc.go
index 0ed1dcc5526..e906daf2d4b 100644
--- a/pkg/controller/volume/ephemeral/config/v1alpha1/doc.go
+++ b/pkg/controller/volume/ephemeral/config/v1alpha1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/volume/ephemeral/config
 // +k8s:conversion-gen-external-types=k8s.io/kube-controller-manager/config/v1alpha1
 
-package v1alpha1 // import "k8s.io/kubernetes/pkg/controller/volume/ephemeral/config/v1alpha1"
+package v1alpha1
diff --git a/pkg/controller/volume/persistentvolume/config/doc.go b/pkg/controller/volume/persistentvolume/config/doc.go
index 7ddf8932e97..164ec715bb4 100644
--- a/pkg/controller/volume/persistentvolume/config/doc.go
+++ b/pkg/controller/volume/persistentvolume/config/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package config // import "k8s.io/kubernetes/pkg/controller/volume/persistentvolume/config"
+package config
diff --git a/pkg/controller/volume/persistentvolume/config/v1alpha1/doc.go b/pkg/controller/volume/persistentvolume/config/v1alpha1/doc.go
index 9c5e4fa1b13..c752e748aba 100644
--- a/pkg/controller/volume/persistentvolume/config/v1alpha1/doc.go
+++ b/pkg/controller/volume/persistentvolume/config/v1alpha1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/volume/persistentvolume/config
 // +k8s:conversion-gen-external-types=k8s.io/kube-controller-manager/config/v1alpha1
 
-package v1alpha1 // import "k8s.io/kubernetes/pkg/controller/volume/persistentvolume/config/v1alpha1"
+package v1alpha1
diff --git a/pkg/controlplane/doc.go b/pkg/controlplane/doc.go
index 9bb34fa9a9b..36e0d128536 100644
--- a/pkg/controlplane/doc.go
+++ b/pkg/controlplane/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package controlplane contains code for setting up and running a Kubernetes
 // cluster control plane API server.
-package controlplane // import "k8s.io/kubernetes/pkg/controlplane"
+package controlplane
diff --git a/pkg/credentialprovider/doc.go b/pkg/credentialprovider/doc.go
index 5acf6ef6235..41c12410f05 100644
--- a/pkg/credentialprovider/doc.go
+++ b/pkg/credentialprovider/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package credentialprovider supplies interfaces and implementations for
 // docker registry providers to expose their authentication scheme.
-package credentialprovider // import "k8s.io/kubernetes/pkg/credentialprovider"
+package credentialprovider
diff --git a/pkg/fieldpath/doc.go b/pkg/fieldpath/doc.go
index 400d001e7f2..83cbdce0c84 100644
--- a/pkg/fieldpath/doc.go
+++ b/pkg/fieldpath/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package fieldpath supplies methods for extracting fields from objects
 // given a path to a field.
-package fieldpath // import "k8s.io/kubernetes/pkg/fieldpath"
+package fieldpath
diff --git a/pkg/kubectl/doc.go b/pkg/kubectl/doc.go
index 52afc49f19f..dd376cc01fa 100644
--- a/pkg/kubectl/doc.go
+++ b/pkg/kubectl/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // under k8s.io/kubernetes/cmd. The functions are kept in this package to better
 // support unit testing. The main() method for kubectl is only an entry point
 // and should contain no functionality.
-package kubectl // import "k8s.io/kubernetes/pkg/kubectl"
+package kubectl
diff --git a/pkg/kubelet/apis/config/doc.go b/pkg/kubelet/apis/config/doc.go
index ad40e68340b..78af1179476 100644
--- a/pkg/kubelet/apis/config/doc.go
+++ b/pkg/kubelet/apis/config/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +groupName=kubelet.config.k8s.io
 
-package config // import "k8s.io/kubernetes/pkg/kubelet/apis/config"
+package config
diff --git a/pkg/kubelet/apis/config/v1/doc.go b/pkg/kubelet/apis/config/v1/doc.go
index 713be2de60a..af1047e66d2 100644
--- a/pkg/kubelet/apis/config/v1/doc.go
+++ b/pkg/kubelet/apis/config/v1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 // +k8s:defaulter-gen-input=k8s.io/kubelet/config/v1
 // +groupName=kubelet.config.k8s.io
 
-package v1 // import "k8s.io/kubernetes/pkg/kubelet/apis/config/v1"
+package v1
diff --git a/pkg/kubelet/apis/config/v1alpha1/doc.go b/pkg/kubelet/apis/config/v1alpha1/doc.go
index 3dcd444d7c7..9622b4ee338 100644
--- a/pkg/kubelet/apis/config/v1alpha1/doc.go
+++ b/pkg/kubelet/apis/config/v1alpha1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 // +k8s:defaulter-gen-input=k8s.io/kubelet/config/v1alpha1
 // +groupName=kubelet.config.k8s.io
 
-package v1alpha1 // import "k8s.io/kubernetes/pkg/kubelet/apis/config/v1alpha1"
+package v1alpha1
diff --git a/pkg/kubelet/apis/config/v1beta1/doc.go b/pkg/kubelet/apis/config/v1beta1/doc.go
index f8190851a83..2e7b7096e12 100644
--- a/pkg/kubelet/apis/config/v1beta1/doc.go
+++ b/pkg/kubelet/apis/config/v1beta1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 // +k8s:defaulter-gen-input=k8s.io/kubelet/config/v1beta1
 // +groupName=kubelet.config.k8s.io
 
-package v1beta1 // import "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1"
+package v1beta1
diff --git a/pkg/kubelet/cadvisor/doc.go b/pkg/kubelet/cadvisor/doc.go
index afd79492d3a..113bacf37be 100644
--- a/pkg/kubelet/cadvisor/doc.go
+++ b/pkg/kubelet/cadvisor/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package cadvisor provides an interface for Kubelet interactions with cAdvisor.
-package cadvisor // import "k8s.io/kubernetes/pkg/kubelet/cadvisor"
+package cadvisor
diff --git a/pkg/kubelet/cm/cpumanager/topology/doc.go b/pkg/kubelet/cm/cpumanager/topology/doc.go
index 76ff2299159..8a22c5db7e6 100644
--- a/pkg/kubelet/cm/cpumanager/topology/doc.go
+++ b/pkg/kubelet/cm/cpumanager/topology/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package topology contains helpers for the CPU manager.
-package topology // import "k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/topology"
+package topology
diff --git a/pkg/kubelet/cm/doc.go b/pkg/kubelet/cm/doc.go
index 422aca0750b..4f007f7ce10 100644
--- a/pkg/kubelet/cm/doc.go
+++ b/pkg/kubelet/cm/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // to manage containers. For example, they contain functions to configure containers' cgroups,
 // ensure containers run with the desired QoS, and allocate compute resources like cpus, memory,
 // devices...
-package cm // import "k8s.io/kubernetes/pkg/kubelet/cm"
+package cm
diff --git a/pkg/kubelet/config/doc.go b/pkg/kubelet/config/doc.go
index a72262ff04a..1d839ba325e 100644
--- a/pkg/kubelet/config/doc.go
+++ b/pkg/kubelet/config/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package config implements the pod configuration readers.
-package config // import "k8s.io/kubernetes/pkg/kubelet/config"
+package config
diff --git a/pkg/kubelet/doc.go b/pkg/kubelet/doc.go
index ce5bb18b2cc..7d31922769f 100644
--- a/pkg/kubelet/doc.go
+++ b/pkg/kubelet/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package kubelet is the package that contains the libraries that drive the Kubelet binary.
 // The kubelet is responsible for node level pod management.  It runs on each worker in the cluster.
-package kubelet // import "k8s.io/kubernetes/pkg/kubelet"
+package kubelet
diff --git a/pkg/kubelet/envvars/doc.go b/pkg/kubelet/envvars/doc.go
index d951937718b..42fea62f220 100644
--- a/pkg/kubelet/envvars/doc.go
+++ b/pkg/kubelet/envvars/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package envvars is the package that build the environment variables that kubernetes provides
 // to the containers run by it.
-package envvars // import "k8s.io/kubernetes/pkg/kubelet/envvars"
+package envvars
diff --git a/pkg/kubelet/eviction/doc.go b/pkg/kubelet/eviction/doc.go
index 0db0d82b766..1395301680d 100644
--- a/pkg/kubelet/eviction/doc.go
+++ b/pkg/kubelet/eviction/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package eviction is responsible for enforcing eviction thresholds to maintain
 // node stability.
-package eviction // import "k8s.io/kubernetes/pkg/kubelet/eviction"
+package eviction
diff --git a/pkg/kubelet/lifecycle/doc.go b/pkg/kubelet/lifecycle/doc.go
index eab81169a0e..0c1dd9a1cc7 100644
--- a/pkg/kubelet/lifecycle/doc.go
+++ b/pkg/kubelet/lifecycle/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package lifecycle contains handlers for pod lifecycle events and interfaces
 // to integrate with kubelet admission, synchronization, and eviction of pods.
-package lifecycle // import "k8s.io/kubernetes/pkg/kubelet/lifecycle"
+package lifecycle
diff --git a/pkg/kubelet/pleg/doc.go b/pkg/kubelet/pleg/doc.go
index 2263f2cabfb..cda634061c4 100644
--- a/pkg/kubelet/pleg/doc.go
+++ b/pkg/kubelet/pleg/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package pleg contains types and a generic implementation of the pod
 // lifecycle event generator.
-package pleg // import "k8s.io/kubernetes/pkg/kubelet/pleg"
+package pleg
diff --git a/pkg/kubelet/qos/doc.go b/pkg/kubelet/qos/doc.go
index ed440f5984b..acd561b216c 100644
--- a/pkg/kubelet/qos/doc.go
+++ b/pkg/kubelet/qos/doc.go
@@ -22,4 +22,4 @@ limitations under the License.
 // when available.
 // Best-Effort containers, which don't specify a request, can use resources only if not being used
 // by other pods.
-package qos // import "k8s.io/kubernetes/pkg/kubelet/qos"
+package qos
diff --git a/pkg/kubelet/qos/helpers.go b/pkg/kubelet/qos/helpers.go
index 17ed12e3b33..33b6c166b7f 100644
--- a/pkg/kubelet/qos/helpers.go
+++ b/pkg/kubelet/qos/helpers.go
@@ -23,7 +23,7 @@ limitations under the License.
 // Best-Effort containers, which don't specify a request, can use resources only if not being used
 // by other pods.
 
-package qos // import "k8s.io/kubernetes/pkg/kubelet/qos"
+package qos
 
 import (
 	v1 "k8s.io/api/core/v1"
diff --git a/pkg/kubelet/server/doc.go b/pkg/kubelet/server/doc.go
index 843c0a58bdb..22774d20d05 100644
--- a/pkg/kubelet/server/doc.go
+++ b/pkg/kubelet/server/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package server contains functions related to serving Kubelet's external interface.
-package server // import "k8s.io/kubernetes/pkg/kubelet/server"
+package server
diff --git a/pkg/kubelet/server/stats/doc.go b/pkg/kubelet/server/stats/doc.go
index a43a61e4c96..f8d987c1ee9 100644
--- a/pkg/kubelet/server/stats/doc.go
+++ b/pkg/kubelet/server/stats/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // Package stats handles exporting Kubelet and container stats.
 // NOTE: We intend to move this functionality into a standalone pod, so this package should be very
 // loosely coupled to the rest of the Kubelet.
-package stats // import "k8s.io/kubernetes/pkg/kubelet/server/stats"
+package stats
diff --git a/pkg/kubelet/types/doc.go b/pkg/kubelet/types/doc.go
index 814bf6db38c..9227a16ef40 100644
--- a/pkg/kubelet/types/doc.go
+++ b/pkg/kubelet/types/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package types contains common types in the Kubelet.
-package types // import "k8s.io/kubernetes/pkg/kubelet/types"
+package types
diff --git a/pkg/kubelet/util/doc.go b/pkg/kubelet/util/doc.go
index eaccd63a356..0f119d2f568 100644
--- a/pkg/kubelet/util/doc.go
+++ b/pkg/kubelet/util/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package util holds utility functions.
-package util // import "k8s.io/kubernetes/pkg/kubelet/util"
+package util
diff --git a/pkg/kubelet/util/store/doc.go b/pkg/kubelet/util/store/doc.go
index b4d8523a097..04f0129b293 100644
--- a/pkg/kubelet/util/store/doc.go
+++ b/pkg/kubelet/util/store/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package store hosts a Store interface and its implementations.
-package store // import "k8s.io/kubernetes/pkg/kubelet/util/store"
+package store
diff --git a/pkg/kubelet/winstats/doc.go b/pkg/kubelet/winstats/doc.go
index 1a9f7decdcc..9802d587b5a 100644
--- a/pkg/kubelet/winstats/doc.go
+++ b/pkg/kubelet/winstats/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package winstats provides a client to get node and pod level stats on windows
-package winstats // import "k8s.io/kubernetes/pkg/kubelet/winstats"
+package winstats
diff --git a/pkg/probe/doc.go b/pkg/probe/doc.go
index 10fad970676..89c70b2c16a 100644
--- a/pkg/probe/doc.go
+++ b/pkg/probe/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package probe contains utilities for health probing, as well as health status information.
-package probe // import "k8s.io/kubernetes/pkg/probe"
+package probe
diff --git a/pkg/proxy/apis/config/doc.go b/pkg/proxy/apis/config/doc.go
index 64cad5ced19..6760677bf80 100644
--- a/pkg/proxy/apis/config/doc.go
+++ b/pkg/proxy/apis/config/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +groupName=kubeproxy.config.k8s.io
 
-package config // import "k8s.io/kubernetes/pkg/proxy/apis/config"
+package config
diff --git a/pkg/proxy/apis/config/v1alpha1/doc.go b/pkg/proxy/apis/config/v1alpha1/doc.go
index a67f856a8d0..59c9a67121e 100644
--- a/pkg/proxy/apis/config/v1alpha1/doc.go
+++ b/pkg/proxy/apis/config/v1alpha1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 // +k8s:defaulter-gen-input=k8s.io/kube-proxy/config/v1alpha1
 // +groupName=kubeproxy.config.k8s.io
 
-package v1alpha1 // import "k8s.io/kubernetes/pkg/proxy/apis/config/v1alpha1"
+package v1alpha1
diff --git a/pkg/proxy/config/doc.go b/pkg/proxy/config/doc.go
index cb0f23b6a39..632d1618b82 100644
--- a/pkg/proxy/config/doc.go
+++ b/pkg/proxy/config/doc.go
@@ -22,4 +22,4 @@ limitations under the License.
 // to resolve conflicts of any sort. Basic idea is that each configuration source gets a channel
 // from the Config service and pushes updates to it via that channel. Config then keeps track of
 // incremental & replace changes and distributes them to listeners as appropriate.
-package config // import "k8s.io/kubernetes/pkg/proxy/config"
+package config
diff --git a/pkg/proxy/doc.go b/pkg/proxy/doc.go
index 3bed0fa3903..a69b3082cd8 100644
--- a/pkg/proxy/doc.go
+++ b/pkg/proxy/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package proxy implements the layer-3 network proxy.
-package proxy // import "k8s.io/kubernetes/pkg/proxy"
+package proxy
diff --git a/pkg/proxy/healthcheck/doc.go b/pkg/proxy/healthcheck/doc.go
index 0a9ea0944bc..1ac8cff4702 100644
--- a/pkg/proxy/healthcheck/doc.go
+++ b/pkg/proxy/healthcheck/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package healthcheck provides tools for serving kube-proxy healthchecks.
-package healthcheck // import "k8s.io/kubernetes/pkg/proxy/healthcheck"
+package healthcheck
diff --git a/pkg/proxy/winkernel/doc.go b/pkg/proxy/winkernel/doc.go
index 9d4f4d013fe..f64e37ef340 100644
--- a/pkg/proxy/winkernel/doc.go
+++ b/pkg/proxy/winkernel/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package winkernel implements the Windows-kernel-based proxy
-package winkernel // import "k8s.io/kubernetes/pkg/proxy/winkernel"
+package winkernel
diff --git a/pkg/quota/v1/evaluator/core/doc.go b/pkg/quota/v1/evaluator/core/doc.go
index cd8e000dd6d..8d187c01930 100644
--- a/pkg/quota/v1/evaluator/core/doc.go
+++ b/pkg/quota/v1/evaluator/core/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package core contains modules that interface with the core api group
-package core // import "k8s.io/kubernetes/pkg/quota/v1/evaluator/core"
+package core
diff --git a/pkg/registry/admissionregistration/mutatingadmissionpolicy/doc.go b/pkg/registry/admissionregistration/mutatingadmissionpolicy/doc.go
index 5a842f7af37..631ef58d215 100644
--- a/pkg/registry/admissionregistration/mutatingadmissionpolicy/doc.go
+++ b/pkg/registry/admissionregistration/mutatingadmissionpolicy/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package mutatingadmissionpolicy // import "k8s.io/kubernetes/pkg/registry/admissionregistration/mutatingadmissionpolicy"
+package mutatingadmissionpolicy
diff --git a/pkg/registry/admissionregistration/mutatingadmissionpolicybinding/doc.go b/pkg/registry/admissionregistration/mutatingadmissionpolicybinding/doc.go
index b19a2185a08..4a2b7994f2d 100644
--- a/pkg/registry/admissionregistration/mutatingadmissionpolicybinding/doc.go
+++ b/pkg/registry/admissionregistration/mutatingadmissionpolicybinding/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package mutatingadmissionpolicybinding // import "k8s.io/kubernetes/pkg/registry/admissionregistration/mutatingadmissionpolicybinding"
+package mutatingadmissionpolicybinding
diff --git a/pkg/registry/admissionregistration/mutatingwebhookconfiguration/doc.go b/pkg/registry/admissionregistration/mutatingwebhookconfiguration/doc.go
index 1c56651af12..fb98ee9c7ed 100644
--- a/pkg/registry/admissionregistration/mutatingwebhookconfiguration/doc.go
+++ b/pkg/registry/admissionregistration/mutatingwebhookconfiguration/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package mutatingwebhookconfiguration // import "k8s.io/kubernetes/pkg/registry/admissionregistration/mutatingwebhookconfiguration"
+package mutatingwebhookconfiguration
diff --git a/pkg/registry/admissionregistration/validatingadmissionpolicy/doc.go b/pkg/registry/admissionregistration/validatingadmissionpolicy/doc.go
index 217ee93f469..fa2793e5e44 100644
--- a/pkg/registry/admissionregistration/validatingadmissionpolicy/doc.go
+++ b/pkg/registry/admissionregistration/validatingadmissionpolicy/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package validatingadmissionpolicy // import "k8s.io/kubernetes/pkg/registry/admissionregistration/validatingadmissionpolicy"
+package validatingadmissionpolicy
diff --git a/pkg/registry/admissionregistration/validatingadmissionpolicybinding/doc.go b/pkg/registry/admissionregistration/validatingadmissionpolicybinding/doc.go
index fac83d6a1ac..b07d8caeb87 100644
--- a/pkg/registry/admissionregistration/validatingadmissionpolicybinding/doc.go
+++ b/pkg/registry/admissionregistration/validatingadmissionpolicybinding/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package validatingadmissionpolicybinding // import "k8s.io/kubernetes/pkg/registry/admissionregistration/validatingadmissionpolicybinding"
+package validatingadmissionpolicybinding
diff --git a/pkg/registry/admissionregistration/validatingwebhookconfiguration/doc.go b/pkg/registry/admissionregistration/validatingwebhookconfiguration/doc.go
index d23152a4b44..b97586ef675 100644
--- a/pkg/registry/admissionregistration/validatingwebhookconfiguration/doc.go
+++ b/pkg/registry/admissionregistration/validatingwebhookconfiguration/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package validatingwebhookconfiguration // import "k8s.io/kubernetes/pkg/registry/admissionregistration/validatingwebhookconfiguration"
+package validatingwebhookconfiguration
diff --git a/pkg/registry/apiserverinternal/storageversion/doc.go b/pkg/registry/apiserverinternal/storageversion/doc.go
index eb2775dc11f..8ff94fa894d 100644
--- a/pkg/registry/apiserverinternal/storageversion/doc.go
+++ b/pkg/registry/apiserverinternal/storageversion/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package storageversion provides Registry interface and it's RESTStorage
 // implementation for storing StorageVersion api objects.
-package storageversion // import "k8s.io/kubernetes/pkg/registry/apiserverinternal/storageversion"
+package storageversion
diff --git a/pkg/registry/apps/controllerrevision/doc.go b/pkg/registry/apps/controllerrevision/doc.go
index 9c10c8e87c3..5fe975f7eb8 100644
--- a/pkg/registry/apps/controllerrevision/doc.go
+++ b/pkg/registry/apps/controllerrevision/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllerrevision // import "k8s.io/kubernetes/pkg/registry/apps/controllerrevision"
+package controllerrevision
diff --git a/pkg/registry/apps/daemonset/doc.go b/pkg/registry/apps/daemonset/doc.go
index b8f7f2c70bd..2c1697402b5 100644
--- a/pkg/registry/apps/daemonset/doc.go
+++ b/pkg/registry/apps/daemonset/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package daemonset provides Registry interface and its RESTStorage
 // implementation for storing DaemonSet api objects.
-package daemonset // import "k8s.io/kubernetes/pkg/registry/apps/daemonset"
+package daemonset
diff --git a/pkg/registry/apps/deployment/doc.go b/pkg/registry/apps/deployment/doc.go
index bc2a79604d4..6bc30adfacb 100644
--- a/pkg/registry/apps/deployment/doc.go
+++ b/pkg/registry/apps/deployment/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package deployment // import "k8s.io/kubernetes/pkg/registry/apps/deployment"
+package deployment
diff --git a/pkg/registry/apps/replicaset/doc.go b/pkg/registry/apps/replicaset/doc.go
index 722893d2223..3e8d4bfefec 100644
--- a/pkg/registry/apps/replicaset/doc.go
+++ b/pkg/registry/apps/replicaset/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package replicaset provides Registry interface and it's RESTStorage
 // implementation for storing ReplicaSet api objects.
-package replicaset // import "k8s.io/kubernetes/pkg/registry/apps/replicaset"
+package replicaset
diff --git a/pkg/registry/apps/statefulset/doc.go b/pkg/registry/apps/statefulset/doc.go
index b99adae8115..abea1f2cae2 100644
--- a/pkg/registry/apps/statefulset/doc.go
+++ b/pkg/registry/apps/statefulset/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package statefulset // import "k8s.io/kubernetes/pkg/registry/apps/statefulset"
+package statefulset
diff --git a/pkg/registry/autoscaling/horizontalpodautoscaler/doc.go b/pkg/registry/autoscaling/horizontalpodautoscaler/doc.go
index 4fb09da3655..349ff005443 100644
--- a/pkg/registry/autoscaling/horizontalpodautoscaler/doc.go
+++ b/pkg/registry/autoscaling/horizontalpodautoscaler/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package horizontalpodautoscaler // import "k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler"
+package horizontalpodautoscaler
diff --git a/pkg/registry/batch/cronjob/doc.go b/pkg/registry/batch/cronjob/doc.go
index 679ad9b9df2..69d3af6cbe3 100644
--- a/pkg/registry/batch/cronjob/doc.go
+++ b/pkg/registry/batch/cronjob/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package cronjob provides Registry interface and it's RESTStorage
 // implementation for storing CronJob api objects.
-package cronjob // import "k8s.io/kubernetes/pkg/registry/batch/cronjob"
+package cronjob
diff --git a/pkg/registry/batch/job/doc.go b/pkg/registry/batch/job/doc.go
index a6dab828961..f34b36abc04 100644
--- a/pkg/registry/batch/job/doc.go
+++ b/pkg/registry/batch/job/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package job provides Registry interface and it's RESTStorage
 // implementation for storing Job api objects.
-package job // import "k8s.io/kubernetes/pkg/registry/batch/job"
+package job
diff --git a/pkg/registry/certificates/certificates/doc.go b/pkg/registry/certificates/certificates/doc.go
index 73d6fe24696..8f69902f2ea 100644
--- a/pkg/registry/certificates/certificates/doc.go
+++ b/pkg/registry/certificates/certificates/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package certificates provides Registry interface and its RESTStorage
 // implementation for storing CertificateSigningRequest objects.
-package certificates // import "k8s.io/kubernetes/pkg/registry/certificates/certificates"
+package certificates
diff --git a/pkg/registry/certificates/clustertrustbundle/strategy.go b/pkg/registry/certificates/clustertrustbundle/strategy.go
index 5708ede08ec..e334e36db67 100644
--- a/pkg/registry/certificates/clustertrustbundle/strategy.go
+++ b/pkg/registry/certificates/clustertrustbundle/strategy.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // Package clustertrustbundle provides Registry interface and its RESTStorage
 // implementation for storing ClusterTrustBundle objects.
-package clustertrustbundle // import "k8s.io/kubernetes/pkg/registry/certificates/clustertrustbundle"
+package clustertrustbundle
 
 import (
 	"context"
diff --git a/pkg/registry/core/componentstatus/doc.go b/pkg/registry/core/componentstatus/doc.go
index cd75f22d28a..af0672af838 100644
--- a/pkg/registry/core/componentstatus/doc.go
+++ b/pkg/registry/core/componentstatus/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package componentstatus provides interfaces and implementation for retrieving cluster
 // component status.
-package componentstatus // import "k8s.io/kubernetes/pkg/registry/core/componentstatus"
+package componentstatus
diff --git a/pkg/registry/core/configmap/doc.go b/pkg/registry/core/configmap/doc.go
index 8abd47c0382..dd414e3ce47 100644
--- a/pkg/registry/core/configmap/doc.go
+++ b/pkg/registry/core/configmap/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // Package configmap provides Registry interface
 // and its REST implementation for storing
 // ConfigMap API objects.
-package configmap // import "k8s.io/kubernetes/pkg/registry/core/configmap"
+package configmap
diff --git a/pkg/registry/core/endpoint/doc.go b/pkg/registry/core/endpoint/doc.go
index ff0f678d9b3..8d8bffd52f3 100644
--- a/pkg/registry/core/endpoint/doc.go
+++ b/pkg/registry/core/endpoint/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package endpoint provides Registry interface and it's RESTStorage
 // implementation for storing Endpoint api objects.
-package endpoint // import "k8s.io/kubernetes/pkg/registry/core/endpoint"
+package endpoint
diff --git a/pkg/registry/core/event/doc.go b/pkg/registry/core/event/doc.go
index af702d55de7..5c5446d61a6 100644
--- a/pkg/registry/core/event/doc.go
+++ b/pkg/registry/core/event/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package event provides Registry interface and it's REST
 // implementation for storing Event api objects.
-package event // import "k8s.io/kubernetes/pkg/registry/core/event"
+package event
diff --git a/pkg/registry/core/limitrange/doc.go b/pkg/registry/core/limitrange/doc.go
index 3bfae45cb62..4a6ab76c5c4 100644
--- a/pkg/registry/core/limitrange/doc.go
+++ b/pkg/registry/core/limitrange/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package limitrange provides Registry interface and it's REST
 // implementation for storing LimitRange api objects.
-package limitrange // import "k8s.io/kubernetes/pkg/registry/core/limitrange"
+package limitrange
diff --git a/pkg/registry/core/namespace/doc.go b/pkg/registry/core/namespace/doc.go
index a01a2e5f9e4..f618932fe2c 100644
--- a/pkg/registry/core/namespace/doc.go
+++ b/pkg/registry/core/namespace/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package namespace provides Registry interface and it's REST
 // implementation for storing Namespace api objects.
-package namespace // import "k8s.io/kubernetes/pkg/registry/core/namespace"
+package namespace
diff --git a/pkg/registry/core/node/doc.go b/pkg/registry/core/node/doc.go
index 35afe9968dd..79a95fd3d38 100644
--- a/pkg/registry/core/node/doc.go
+++ b/pkg/registry/core/node/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package node provides Registry interface and implementation for storing Nodes.
-package node // import "k8s.io/kubernetes/pkg/registry/core/node"
+package node
diff --git a/pkg/registry/core/persistentvolume/doc.go b/pkg/registry/core/persistentvolume/doc.go
index 17cfef15332..06fda296fa9 100644
--- a/pkg/registry/core/persistentvolume/doc.go
+++ b/pkg/registry/core/persistentvolume/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package persistentvolume // import "k8s.io/kubernetes/pkg/registry/core/persistentvolume"
+package persistentvolume
diff --git a/pkg/registry/core/persistentvolumeclaim/doc.go b/pkg/registry/core/persistentvolumeclaim/doc.go
index 91dbc298dc0..c6950ee8c0f 100644
--- a/pkg/registry/core/persistentvolumeclaim/doc.go
+++ b/pkg/registry/core/persistentvolumeclaim/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package persistentvolumeclaim // import "k8s.io/kubernetes/pkg/registry/core/persistentvolumeclaim"
+package persistentvolumeclaim
diff --git a/pkg/registry/core/pod/doc.go b/pkg/registry/core/pod/doc.go
index 7a922302c05..d2294852b51 100644
--- a/pkg/registry/core/pod/doc.go
+++ b/pkg/registry/core/pod/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package pod provides Registry interface and it's RESTStorage
 // implementation for storing Pod api objects.
-package pod // import "k8s.io/kubernetes/pkg/registry/core/pod"
+package pod
diff --git a/pkg/registry/core/podtemplate/doc.go b/pkg/registry/core/podtemplate/doc.go
index c0c2939d076..b3e43f22ffd 100644
--- a/pkg/registry/core/podtemplate/doc.go
+++ b/pkg/registry/core/podtemplate/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package podtemplate provides RESTStorage implementations for storing PodTemplate API objects.
-package podtemplate // import "k8s.io/kubernetes/pkg/registry/core/podtemplate"
+package podtemplate
diff --git a/pkg/registry/core/replicationcontroller/doc.go b/pkg/registry/core/replicationcontroller/doc.go
index c9d419a25e9..22fd6581762 100644
--- a/pkg/registry/core/replicationcontroller/doc.go
+++ b/pkg/registry/core/replicationcontroller/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package replicationcontroller provides Registry interface and it's RESTStorage
 // implementation for storing ReplicationController api objects.
-package replicationcontroller // import "k8s.io/kubernetes/pkg/registry/core/replicationcontroller"
+package replicationcontroller
diff --git a/pkg/registry/core/resourcequota/doc.go b/pkg/registry/core/resourcequota/doc.go
index 4f4052f13cb..aa335fe24c5 100644
--- a/pkg/registry/core/resourcequota/doc.go
+++ b/pkg/registry/core/resourcequota/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package resourcequota provides Registry interface and it's REST
 // implementation for storing ResourceQuota api objects.
-package resourcequota // import "k8s.io/kubernetes/pkg/registry/core/resourcequota"
+package resourcequota
diff --git a/pkg/registry/core/secret/doc.go b/pkg/registry/core/secret/doc.go
index 5b150f76b66..1dc79f578f5 100644
--- a/pkg/registry/core/secret/doc.go
+++ b/pkg/registry/core/secret/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package secrets provides Registry interface and its REST
 // implementation for storing Secret api objects.
-package secret // import "k8s.io/kubernetes/pkg/registry/core/secret"
+package secret
diff --git a/pkg/registry/core/service/doc.go b/pkg/registry/core/service/doc.go
index 3e523a85991..13616309c4a 100644
--- a/pkg/registry/core/service/doc.go
+++ b/pkg/registry/core/service/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package service provides the Registry interface and its RESTStorage
 // implementation for storing Service api objects.
-package service // import "k8s.io/kubernetes/pkg/registry/core/service"
+package service
diff --git a/pkg/registry/core/serviceaccount/doc.go b/pkg/registry/core/serviceaccount/doc.go
index a53e249dba1..ea714a980f4 100644
--- a/pkg/registry/core/serviceaccount/doc.go
+++ b/pkg/registry/core/serviceaccount/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package serviceaccount provides a Registry interface and a strategy
 // implementation for storing ServiceAccount API objects.
-package serviceaccount // import "k8s.io/kubernetes/pkg/registry/core/serviceaccount"
+package serviceaccount
diff --git a/pkg/registry/discovery/endpointslice/doc.go b/pkg/registry/discovery/endpointslice/doc.go
index 670128e8a86..bc7de00717d 100644
--- a/pkg/registry/discovery/endpointslice/doc.go
+++ b/pkg/registry/discovery/endpointslice/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package endpointslice // import "k8s.io/kubernetes/pkg/registry/discovery/endpointslice"
+package endpointslice
diff --git a/pkg/registry/doc.go b/pkg/registry/doc.go
index 21331a03e38..2a8a439efd1 100644
--- a/pkg/registry/doc.go
+++ b/pkg/registry/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package registry implements the storage and system logic for the core of the api server.
-package registry // import "k8s.io/kubernetes/pkg/registry"
+package registry
diff --git a/pkg/registry/flowcontrol/flowschema/doc.go b/pkg/registry/flowcontrol/flowschema/doc.go
index 074b2aecd94..c5413710b79 100644
--- a/pkg/registry/flowcontrol/flowschema/doc.go
+++ b/pkg/registry/flowcontrol/flowschema/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package flowschema provides model implementation of flow-schema api
-package flowschema // import "k8s.io/kubernetes/pkg/registry/flowcontrol/flowschema"
+package flowschema
diff --git a/pkg/registry/flowcontrol/prioritylevelconfiguration/doc.go b/pkg/registry/flowcontrol/prioritylevelconfiguration/doc.go
index 57c8c47a9ea..13abce4bddd 100644
--- a/pkg/registry/flowcontrol/prioritylevelconfiguration/doc.go
+++ b/pkg/registry/flowcontrol/prioritylevelconfiguration/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package prioritylevelconfiguration provides model implementation of priority-level-configuration api
-package prioritylevelconfiguration // import "k8s.io/kubernetes/pkg/registry/flowcontrol/prioritylevelconfiguration"
+package prioritylevelconfiguration
diff --git a/pkg/registry/networking/ingress/doc.go b/pkg/registry/networking/ingress/doc.go
index c89d1f09e4a..42fb63fc57a 100644
--- a/pkg/registry/networking/ingress/doc.go
+++ b/pkg/registry/networking/ingress/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package ingress // import "k8s.io/kubernetes/pkg/registry/networking/ingress"
+package ingress
diff --git a/pkg/registry/networking/ingressclass/doc.go b/pkg/registry/networking/ingressclass/doc.go
index 37c3d071b23..fb4b595e8c2 100644
--- a/pkg/registry/networking/ingressclass/doc.go
+++ b/pkg/registry/networking/ingressclass/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package ingressclass // import "k8s.io/kubernetes/pkg/registry/networking/ingressclass"
+package ingressclass
diff --git a/pkg/registry/networking/ipaddress/doc.go b/pkg/registry/networking/ipaddress/doc.go
index f9e67ffc9a4..5b09bc32c22 100644
--- a/pkg/registry/networking/ipaddress/doc.go
+++ b/pkg/registry/networking/ipaddress/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package ipaddress // import "k8s.io/kubernetes/pkg/registry/networking/ipaddress"
+package ipaddress
diff --git a/pkg/registry/networking/networkpolicy/doc.go b/pkg/registry/networking/networkpolicy/doc.go
index 7b338bc5e89..5f61315abce 100644
--- a/pkg/registry/networking/networkpolicy/doc.go
+++ b/pkg/registry/networking/networkpolicy/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package networkpolicy // import "k8s.io/kubernetes/pkg/registry/networking/networkpolicy"
+package networkpolicy
diff --git a/pkg/registry/networking/servicecidr/doc.go b/pkg/registry/networking/servicecidr/doc.go
index 806463623bf..958ea4cb9fe 100644
--- a/pkg/registry/networking/servicecidr/doc.go
+++ b/pkg/registry/networking/servicecidr/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package servicecidr // import "k8s.io/kubernetes/pkg/registry/networking/servicecidr"
+package servicecidr
diff --git a/pkg/registry/node/runtimeclass/doc.go b/pkg/registry/node/runtimeclass/doc.go
index 3540f2014b0..5de8b578c4a 100644
--- a/pkg/registry/node/runtimeclass/doc.go
+++ b/pkg/registry/node/runtimeclass/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package runtimeclass // import "k8s.io/kubernetes/pkg/registry/node/runtimeclass"
+package runtimeclass
diff --git a/pkg/registry/policy/poddisruptionbudget/doc.go b/pkg/registry/policy/poddisruptionbudget/doc.go
index 72e569b5787..a3ee49ca458 100644
--- a/pkg/registry/policy/poddisruptionbudget/doc.go
+++ b/pkg/registry/policy/poddisruptionbudget/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package poddisruptionbudget // import "k8s.io/kubernetes/pkg/registry/policy/poddisruptionbudget"
+package poddisruptionbudget
diff --git a/pkg/registry/rbac/clusterrole/doc.go b/pkg/registry/rbac/clusterrole/doc.go
index bc1745ec17f..9b4e749d522 100644
--- a/pkg/registry/rbac/clusterrole/doc.go
+++ b/pkg/registry/rbac/clusterrole/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package clusterrole provides Registry interface and its RESTStorage
 // implementation for storing ClusterRole objects.
-package clusterrole // import "k8s.io/kubernetes/pkg/registry/rbac/clusterrole"
+package clusterrole
diff --git a/pkg/registry/rbac/clusterrolebinding/doc.go b/pkg/registry/rbac/clusterrolebinding/doc.go
index 67b88a7ed5b..8df6c7cc201 100644
--- a/pkg/registry/rbac/clusterrolebinding/doc.go
+++ b/pkg/registry/rbac/clusterrolebinding/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package certificates provides Registry interface and its RESTStorage
 // implementation for storing ClusterRoleBinding objects.
-package clusterrolebinding // import "k8s.io/kubernetes/pkg/registry/rbac/clusterrolebinding"
+package clusterrolebinding
diff --git a/pkg/registry/rbac/role/doc.go b/pkg/registry/rbac/role/doc.go
index c98942ccbf7..7d9de9ce1bd 100644
--- a/pkg/registry/rbac/role/doc.go
+++ b/pkg/registry/rbac/role/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package role provides Registry interface and its RESTStorage
 // implementation for storing Role objects.
-package role // import "k8s.io/kubernetes/pkg/registry/rbac/role"
+package role
diff --git a/pkg/registry/rbac/rolebinding/doc.go b/pkg/registry/rbac/rolebinding/doc.go
index 327ff238f28..581afbb9f2e 100644
--- a/pkg/registry/rbac/rolebinding/doc.go
+++ b/pkg/registry/rbac/rolebinding/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package certificates provides Registry interface and its RESTStorage
 // implementation for storing RoleBinding objects.
-package rolebinding // import "k8s.io/kubernetes/pkg/registry/rbac/rolebinding"
+package rolebinding
diff --git a/pkg/registry/registrytest/doc.go b/pkg/registry/registrytest/doc.go
index 7e4c5e28662..5b0d285f569 100644
--- a/pkg/registry/registrytest/doc.go
+++ b/pkg/registry/registrytest/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package registrytest provides tests for Registry implementations
 // for storing Nodes, Pods, Schedulers and Services.
-package registrytest // import "k8s.io/kubernetes/pkg/registry/registrytest"
+package registrytest
diff --git a/pkg/registry/scheduling/priorityclass/doc.go b/pkg/registry/scheduling/priorityclass/doc.go
index b4359aed6c2..63e6e5dc7c0 100644
--- a/pkg/registry/scheduling/priorityclass/doc.go
+++ b/pkg/registry/scheduling/priorityclass/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package priorityclass // import "k8s.io/kubernetes/pkg/registry/scheduling/priorityclass"
+package priorityclass
diff --git a/pkg/registry/storagemigration/storagemigration/strategy.go b/pkg/registry/storagemigration/storagemigration/strategy.go
index 37fd58cc647..d1f71a93bf7 100644
--- a/pkg/registry/storagemigration/storagemigration/strategy.go
+++ b/pkg/registry/storagemigration/storagemigration/strategy.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // Package storagemigration provides Registry interface and its RESTStorage
 // implementation for storing StorageVersionMigration objects.
-package storagemigration // import "k8s.io/kubernetes/pkg/registry/storagemigration/storagemigration"
+package storagemigration
 
 import (
 	"context"
diff --git a/pkg/scheduler/apis/config/doc.go b/pkg/scheduler/apis/config/doc.go
index 896eaa83b65..ac48d030776 100644
--- a/pkg/scheduler/apis/config/doc.go
+++ b/pkg/scheduler/apis/config/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +groupName=kubescheduler.config.k8s.io
 
-package config // import "k8s.io/kubernetes/pkg/scheduler/apis/config"
+package config
diff --git a/pkg/scheduler/apis/config/v1/doc.go b/pkg/scheduler/apis/config/v1/doc.go
index 7fa215827be..4e2ff445697 100644
--- a/pkg/scheduler/apis/config/v1/doc.go
+++ b/pkg/scheduler/apis/config/v1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 // +k8s:defaulter-gen-input=k8s.io/kube-scheduler/config/v1
 // +groupName=kubescheduler.config.k8s.io
 
-package v1 // import "k8s.io/kubernetes/pkg/scheduler/apis/config/v1"
+package v1
diff --git a/pkg/security/doc.go b/pkg/security/doc.go
index 57bed3a1745..1652dbeaabb 100644
--- a/pkg/security/doc.go
+++ b/pkg/security/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package security contains security apis and implementations.
-package security // import "k8s.io/kubernetes/pkg/security"
+package security
diff --git a/pkg/securitycontext/doc.go b/pkg/securitycontext/doc.go
index 3ec795d473e..529451e50cd 100644
--- a/pkg/securitycontext/doc.go
+++ b/pkg/securitycontext/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package securitycontext contains security context api implementations
-package securitycontext // import "k8s.io/kubernetes/pkg/securitycontext"
+package securitycontext
diff --git a/pkg/util/bandwidth/doc.go b/pkg/util/bandwidth/doc.go
index 3c26aebbf98..289b17fe291 100644
--- a/pkg/util/bandwidth/doc.go
+++ b/pkg/util/bandwidth/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package bandwidth provides utilities for bandwidth shaping
-package bandwidth // import "k8s.io/kubernetes/pkg/util/bandwidth"
+package bandwidth
diff --git a/pkg/util/iptables/doc.go b/pkg/util/iptables/doc.go
index f2649829342..90d1b45b16a 100644
--- a/pkg/util/iptables/doc.go
+++ b/pkg/util/iptables/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package iptables provides an interface and implementations for running iptables commands.
-package iptables // import "k8s.io/kubernetes/pkg/util/iptables"
+package iptables
diff --git a/pkg/util/oom/doc.go b/pkg/util/oom/doc.go
index 29148f6f598..9825a53f2a5 100644
--- a/pkg/util/oom/doc.go
+++ b/pkg/util/oom/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package oom implements utility functions relating to out of memory management.
-package oom // import "k8s.io/kubernetes/pkg/util/oom"
+package oom
diff --git a/pkg/util/procfs/doc.go b/pkg/util/procfs/doc.go
index bf4a78d03d7..2e99311d028 100644
--- a/pkg/util/procfs/doc.go
+++ b/pkg/util/procfs/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package procfs implements utility functions relating to the /proc mount.
-package procfs // import "k8s.io/kubernetes/pkg/util/procfs"
+package procfs
diff --git a/pkg/util/tolerations/doc.go b/pkg/util/tolerations/doc.go
index 09fa857ab42..4af6a6ee272 100644
--- a/pkg/util/tolerations/doc.go
+++ b/pkg/util/tolerations/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package tolerations provides utilities to work with pod spec tolerations.
-package tolerations // import "k8s.io/kubernetes/pkg/util/tolerations"
+package tolerations
diff --git a/pkg/volume/configmap/doc.go b/pkg/volume/configmap/doc.go
index 3f2a869205f..565a1926041 100644
--- a/pkg/volume/configmap/doc.go
+++ b/pkg/volume/configmap/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package configmap contains the internal representation of configMap volumes.
-package configmap // import "k8s.io/kubernetes/pkg/volume/configmap"
+package configmap
diff --git a/pkg/volume/csi/nodeinfomanager/nodeinfomanager.go b/pkg/volume/csi/nodeinfomanager/nodeinfomanager.go
index a691e5d8a90..333c55792db 100644
--- a/pkg/volume/csi/nodeinfomanager/nodeinfomanager.go
+++ b/pkg/volume/csi/nodeinfomanager/nodeinfomanager.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // Package nodeinfomanager includes internal functions used to add/delete labels to
 // kubernetes nodes for corresponding CSI drivers
-package nodeinfomanager // import "k8s.io/kubernetes/pkg/volume/csi/nodeinfomanager"
+package nodeinfomanager
 
 import (
 	"context"
diff --git a/pkg/volume/doc.go b/pkg/volume/doc.go
index c98a5a1537a..df39f32913c 100644
--- a/pkg/volume/doc.go
+++ b/pkg/volume/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package volume includes internal representations of external volume types
 // as well as utility methods required to mount/unmount volumes to kubelets.
-package volume // import "k8s.io/kubernetes/pkg/volume"
+package volume
diff --git a/pkg/volume/emptydir/doc.go b/pkg/volume/emptydir/doc.go
index 7aeeed1f20b..0e44b36753b 100644
--- a/pkg/volume/emptydir/doc.go
+++ b/pkg/volume/emptydir/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package emptydir contains the internal representation of emptyDir
 // volumes.
-package emptydir // import "k8s.io/kubernetes/pkg/volume/emptydir"
+package emptydir
diff --git a/pkg/volume/fc/doc.go b/pkg/volume/fc/doc.go
index 314f86bbe78..3f23662adb1 100644
--- a/pkg/volume/fc/doc.go
+++ b/pkg/volume/fc/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package fc contains the internal representation of
 // Fibre Channel (fc) volumes.
-package fc // import "k8s.io/kubernetes/pkg/volume/fc"
+package fc
diff --git a/pkg/volume/git_repo/doc.go b/pkg/volume/git_repo/doc.go
index beb723e2c08..349182085ef 100644
--- a/pkg/volume/git_repo/doc.go
+++ b/pkg/volume/git_repo/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package git_repo contains the internal representation of git repo volumes.
-package git_repo // import "k8s.io/kubernetes/pkg/volume/git_repo"
+package git_repo
diff --git a/pkg/volume/hostpath/doc.go b/pkg/volume/hostpath/doc.go
index 0d4051a946e..177e6c1fab6 100644
--- a/pkg/volume/hostpath/doc.go
+++ b/pkg/volume/hostpath/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package hostpath contains the internal representation of hostPath
 // volumes.
-package hostpath // import "k8s.io/kubernetes/pkg/volume/hostpath"
+package hostpath
diff --git a/pkg/volume/iscsi/doc.go b/pkg/volume/iscsi/doc.go
index c8f4471245c..e0588b2cf66 100644
--- a/pkg/volume/iscsi/doc.go
+++ b/pkg/volume/iscsi/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package iscsi contains the internal representation of Internet Small
 // Computer System Interface (iSCSI) volumes.
-package iscsi // import "k8s.io/kubernetes/pkg/volume/iscsi"
+package iscsi
diff --git a/pkg/volume/local/doc.go b/pkg/volume/local/doc.go
index 6817475508e..b653e7bdc98 100644
--- a/pkg/volume/local/doc.go
+++ b/pkg/volume/local/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package local contains the internal representation of local volumes
-package local // import "k8s.io/kubernetes/pkg/volume/local"
+package local
diff --git a/pkg/volume/nfs/doc.go b/pkg/volume/nfs/doc.go
index c4c55f21044..df5a513c7f2 100644
--- a/pkg/volume/nfs/doc.go
+++ b/pkg/volume/nfs/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package nfs contains the internal representation of network file system
 // (NFS) volumes.
-package nfs // import "k8s.io/kubernetes/pkg/volume/nfs"
+package nfs
diff --git a/pkg/volume/secret/doc.go b/pkg/volume/secret/doc.go
index 98c498705da..3e0ec33d2fa 100644
--- a/pkg/volume/secret/doc.go
+++ b/pkg/volume/secret/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package secret contains the internal representation of secret volumes.
-package secret // import "k8s.io/kubernetes/pkg/volume/secret"
+package secret
diff --git a/pkg/volume/util/doc.go b/pkg/volume/util/doc.go
index b32dae216e6..d36990b8ffa 100644
--- a/pkg/volume/util/doc.go
+++ b/pkg/volume/util/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package util contains utility code for use by volume plugins.
-package util // import "k8s.io/kubernetes/pkg/volume/util"
+package util
diff --git a/plugin/pkg/admission/antiaffinity/doc.go b/plugin/pkg/admission/antiaffinity/doc.go
index 5d79fb396b4..4ebcb8c7491 100644
--- a/plugin/pkg/admission/antiaffinity/doc.go
+++ b/plugin/pkg/admission/antiaffinity/doc.go
@@ -26,4 +26,4 @@ limitations under the License.
 // for now this admission controller provides a simple protection, on
 // the assumption that the only legitimate use of hard pod
 // anti-affinity is to exclude other pods from the same node.
-package antiaffinity // import "k8s.io/kubernetes/plugin/pkg/admission/antiaffinity"
+package antiaffinity
diff --git a/plugin/pkg/admission/eventratelimit/apis/eventratelimit/doc.go b/plugin/pkg/admission/eventratelimit/apis/eventratelimit/doc.go
index 56d99bee293..f6dfd6d0ddf 100644
--- a/plugin/pkg/admission/eventratelimit/apis/eventratelimit/doc.go
+++ b/plugin/pkg/admission/eventratelimit/apis/eventratelimit/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package eventratelimit // import "k8s.io/kubernetes/plugin/pkg/admission/eventratelimit/apis/eventratelimit"
+package eventratelimit
diff --git a/plugin/pkg/admission/eventratelimit/apis/eventratelimit/v1alpha1/doc.go b/plugin/pkg/admission/eventratelimit/apis/eventratelimit/v1alpha1/doc.go
index 09fdc9fc39b..8dfb580cf36 100644
--- a/plugin/pkg/admission/eventratelimit/apis/eventratelimit/v1alpha1/doc.go
+++ b/plugin/pkg/admission/eventratelimit/apis/eventratelimit/v1alpha1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +groupName=eventratelimit.admission.k8s.io
 
 // Package v1alpha1 is the v1alpha1 version of the API.
-package v1alpha1 // import "k8s.io/kubernetes/plugin/pkg/admission/eventratelimit/apis/eventratelimit/v1alpha1"
+package v1alpha1
diff --git a/plugin/pkg/admission/eventratelimit/doc.go b/plugin/pkg/admission/eventratelimit/doc.go
index d51d2379b6d..872e8e7c589 100644
--- a/plugin/pkg/admission/eventratelimit/doc.go
+++ b/plugin/pkg/admission/eventratelimit/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package eventratelimit contains an admission controller that enforces a rate limit on events
-package eventratelimit // import "k8s.io/kubernetes/plugin/pkg/admission/eventratelimit"
+package eventratelimit
diff --git a/plugin/pkg/admission/imagepolicy/doc.go b/plugin/pkg/admission/imagepolicy/doc.go
index 508ff33b17c..0714e4376fb 100644
--- a/plugin/pkg/admission/imagepolicy/doc.go
+++ b/plugin/pkg/admission/imagepolicy/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package imagepolicy checks a webhook for image admission
-package imagepolicy // import "k8s.io/kubernetes/plugin/pkg/admission/imagepolicy"
+package imagepolicy
diff --git a/plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction/doc.go b/plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction/doc.go
index 1ea05752d4e..023db9e2f62 100644
--- a/plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction/doc.go
+++ b/plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package podtolerationrestriction // import "k8s.io/kubernetes/plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction"
+package podtolerationrestriction
diff --git a/plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction/v1alpha1/doc.go b/plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction/v1alpha1/doc.go
index 03571ab2bcf..6d54e54483e 100644
--- a/plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction/v1alpha1/doc.go
+++ b/plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction/v1alpha1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +groupName=podtolerationrestriction.admission.k8s.io
 
 // Package v1alpha1 is the v1alpha1 version of the API.
-package v1alpha1 // import "k8s.io/kubernetes/plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction/v1alpha1"
+package v1alpha1
diff --git a/plugin/pkg/admission/podtolerationrestriction/doc.go b/plugin/pkg/admission/podtolerationrestriction/doc.go
index 03976264c9f..78b6a486537 100644
--- a/plugin/pkg/admission/podtolerationrestriction/doc.go
+++ b/plugin/pkg/admission/podtolerationrestriction/doc.go
@@ -27,4 +27,4 @@ limitations under the License.
 // scheduler.alpha.kubernetes.io/defaultTolerations and
 // scheduler.alpha.kubernetes.io/tolerationsWhitelist annotations
 // keys.
-package podtolerationrestriction // import "k8s.io/kubernetes/plugin/pkg/admission/podtolerationrestriction"
+package podtolerationrestriction
diff --git a/plugin/pkg/admission/security/doc.go b/plugin/pkg/admission/security/doc.go
index c0fe55269a9..0fd7a93c9b6 100644
--- a/plugin/pkg/admission/security/doc.go
+++ b/plugin/pkg/admission/security/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package security contains admission plugins specific to cluster security.
-package security // import "k8s.io/kubernetes/plugin/pkg/admission/security"
+package security
diff --git a/plugin/pkg/admission/serviceaccount/doc.go b/plugin/pkg/admission/serviceaccount/doc.go
index a4810bb871d..c4dff221083 100644
--- a/plugin/pkg/admission/serviceaccount/doc.go
+++ b/plugin/pkg/admission/serviceaccount/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package serviceaccount enforces all pods having an associated serviceaccount,
 // and all containers mounting the API token for that serviceaccount at a known location
-package serviceaccount // import "k8s.io/kubernetes/plugin/pkg/admission/serviceaccount"
+package serviceaccount
diff --git a/plugin/pkg/auth/authorizer/doc.go b/plugin/pkg/auth/authorizer/doc.go
index 6640410ce3c..448590585cd 100644
--- a/plugin/pkg/auth/authorizer/doc.go
+++ b/plugin/pkg/auth/authorizer/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package authorizer contains implementations for pkg/auth/authorizer interfaces
-package authorizer // import "k8s.io/kubernetes/plugin/pkg/auth/authorizer"
+package authorizer
diff --git a/plugin/pkg/auth/doc.go b/plugin/pkg/auth/doc.go
index fe2098f9bdc..de816611ebf 100644
--- a/plugin/pkg/auth/doc.go
+++ b/plugin/pkg/auth/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package auth contains implementations for interfaces in the pkg/auth package
-package auth // import "k8s.io/kubernetes/plugin/pkg/auth"
+package auth
diff --git a/staging/src/k8s.io/api/admission/v1/doc.go b/staging/src/k8s.io/api/admission/v1/doc.go
index e7df9f629c3..cab6528214d 100644
--- a/staging/src/k8s.io/api/admission/v1/doc.go
+++ b/staging/src/k8s.io/api/admission/v1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:prerelease-lifecycle-gen=true
 // +groupName=admission.k8s.io
 
-package v1 // import "k8s.io/api/admission/v1"
+package v1
diff --git a/staging/src/k8s.io/api/admission/v1beta1/doc.go b/staging/src/k8s.io/api/admission/v1beta1/doc.go
index a5669022a03..447495684e7 100644
--- a/staging/src/k8s.io/api/admission/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/admission/v1beta1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=admission.k8s.io
 
-package v1beta1 // import "k8s.io/api/admission/v1beta1"
+package v1beta1
diff --git a/staging/src/k8s.io/api/admissionregistration/v1/doc.go b/staging/src/k8s.io/api/admissionregistration/v1/doc.go
index ca0086188a3..ec0ebb9c49c 100644
--- a/staging/src/k8s.io/api/admissionregistration/v1/doc.go
+++ b/staging/src/k8s.io/api/admissionregistration/v1/doc.go
@@ -24,4 +24,4 @@ limitations under the License.
 // AdmissionConfiguration and AdmissionPluginConfiguration are legacy static admission plugin configuration
 // MutatingWebhookConfiguration and ValidatingWebhookConfiguration are for the
 // new dynamic admission controller configuration.
-package v1 // import "k8s.io/api/admissionregistration/v1"
+package v1
diff --git a/staging/src/k8s.io/api/admissionregistration/v1alpha1/doc.go b/staging/src/k8s.io/api/admissionregistration/v1alpha1/doc.go
index 98066211d85..344af9ae09f 100644
--- a/staging/src/k8s.io/api/admissionregistration/v1alpha1/doc.go
+++ b/staging/src/k8s.io/api/admissionregistration/v1alpha1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 // +groupName=admissionregistration.k8s.io
 
 // Package v1alpha1 is the v1alpha1 version of the API.
-package v1alpha1 // import "k8s.io/api/admissionregistration/v1alpha1"
+package v1alpha1
diff --git a/staging/src/k8s.io/api/admissionregistration/v1beta1/doc.go b/staging/src/k8s.io/api/admissionregistration/v1beta1/doc.go
index 0095cb257a4..40d8315738e 100644
--- a/staging/src/k8s.io/api/admissionregistration/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/admissionregistration/v1beta1/doc.go
@@ -24,4 +24,4 @@ limitations under the License.
 // AdmissionConfiguration and AdmissionPluginConfiguration are legacy static admission plugin configuration
 // MutatingWebhookConfiguration and ValidatingWebhookConfiguration are for the
 // new dynamic admission controller configuration.
-package v1beta1 // import "k8s.io/api/admissionregistration/v1beta1"
+package v1beta1
diff --git a/staging/src/k8s.io/api/apidiscovery/v2/doc.go b/staging/src/k8s.io/api/apidiscovery/v2/doc.go
index 4f3ad5f139d..f46d33e942f 100644
--- a/staging/src/k8s.io/api/apidiscovery/v2/doc.go
+++ b/staging/src/k8s.io/api/apidiscovery/v2/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:prerelease-lifecycle-gen=true
 // +groupName=apidiscovery.k8s.io
 
-package v2 // import "k8s.io/api/apidiscovery/v2"
+package v2
diff --git a/staging/src/k8s.io/api/apidiscovery/v2beta1/doc.go b/staging/src/k8s.io/api/apidiscovery/v2beta1/doc.go
index e85da226e02..d4fceab68d4 100644
--- a/staging/src/k8s.io/api/apidiscovery/v2beta1/doc.go
+++ b/staging/src/k8s.io/api/apidiscovery/v2beta1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=apidiscovery.k8s.io
 
-package v2beta1 // import "k8s.io/api/apidiscovery/v2beta1"
+package v2beta1
diff --git a/staging/src/k8s.io/api/apiserverinternal/v1alpha1/doc.go b/staging/src/k8s.io/api/apiserverinternal/v1alpha1/doc.go
index a4da95d44d2..867d7416514 100644
--- a/staging/src/k8s.io/api/apiserverinternal/v1alpha1/doc.go
+++ b/staging/src/k8s.io/api/apiserverinternal/v1alpha1/doc.go
@@ -22,4 +22,4 @@ limitations under the License.
 
 // Package v1alpha1 contains the v1alpha1 version of the API used by the
 // apiservers themselves.
-package v1alpha1 // import "k8s.io/api/apiserverinternal/v1alpha1"
+package v1alpha1
diff --git a/staging/src/k8s.io/api/apps/v1/doc.go b/staging/src/k8s.io/api/apps/v1/doc.go
index d189e860f2c..51fe12c53de 100644
--- a/staging/src/k8s.io/api/apps/v1/doc.go
+++ b/staging/src/k8s.io/api/apps/v1/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
 
-package v1 // import "k8s.io/api/apps/v1"
+package v1
diff --git a/staging/src/k8s.io/api/apps/v1beta1/doc.go b/staging/src/k8s.io/api/apps/v1beta1/doc.go
index 38a358551a8..7770fab5d21 100644
--- a/staging/src/k8s.io/api/apps/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/apps/v1beta1/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
 
-package v1beta1 // import "k8s.io/api/apps/v1beta1"
+package v1beta1
diff --git a/staging/src/k8s.io/api/apps/v1beta2/doc.go b/staging/src/k8s.io/api/apps/v1beta2/doc.go
index ac91fddfd50..7d28fe42df5 100644
--- a/staging/src/k8s.io/api/apps/v1beta2/doc.go
+++ b/staging/src/k8s.io/api/apps/v1beta2/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
 
-package v1beta2 // import "k8s.io/api/apps/v1beta2"
+package v1beta2
diff --git a/staging/src/k8s.io/api/authentication/v1/doc.go b/staging/src/k8s.io/api/authentication/v1/doc.go
index 3bdc89badcd..dc3aed4e4fe 100644
--- a/staging/src/k8s.io/api/authentication/v1/doc.go
+++ b/staging/src/k8s.io/api/authentication/v1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
 
-package v1 // import "k8s.io/api/authentication/v1"
+package v1
diff --git a/staging/src/k8s.io/api/authentication/v1alpha1/doc.go b/staging/src/k8s.io/api/authentication/v1alpha1/doc.go
index eb32def904d..c199ccd4999 100644
--- a/staging/src/k8s.io/api/authentication/v1alpha1/doc.go
+++ b/staging/src/k8s.io/api/authentication/v1alpha1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
 
-package v1alpha1 // import "k8s.io/api/authentication/v1alpha1"
+package v1alpha1
diff --git a/staging/src/k8s.io/api/authentication/v1beta1/doc.go b/staging/src/k8s.io/api/authentication/v1beta1/doc.go
index 2a2b176e43a..af63dc845bc 100644
--- a/staging/src/k8s.io/api/authentication/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/authentication/v1beta1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
 
-package v1beta1 // import "k8s.io/api/authentication/v1beta1"
+package v1beta1
diff --git a/staging/src/k8s.io/api/authorization/v1/doc.go b/staging/src/k8s.io/api/authorization/v1/doc.go
index 77e5a19c4c8..40bf8006e06 100644
--- a/staging/src/k8s.io/api/authorization/v1/doc.go
+++ b/staging/src/k8s.io/api/authorization/v1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:prerelease-lifecycle-gen=true
 // +groupName=authorization.k8s.io
 
-package v1 // import "k8s.io/api/authorization/v1"
+package v1
diff --git a/staging/src/k8s.io/api/authorization/v1beta1/doc.go b/staging/src/k8s.io/api/authorization/v1beta1/doc.go
index c996e35ccc5..9f7332d493c 100644
--- a/staging/src/k8s.io/api/authorization/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/authorization/v1beta1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=authorization.k8s.io
 
-package v1beta1 // import "k8s.io/api/authorization/v1beta1"
+package v1beta1
diff --git a/staging/src/k8s.io/api/autoscaling/v1/doc.go b/staging/src/k8s.io/api/autoscaling/v1/doc.go
index d64c9cbc1a4..4ee085e165c 100644
--- a/staging/src/k8s.io/api/autoscaling/v1/doc.go
+++ b/staging/src/k8s.io/api/autoscaling/v1/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
 
-package v1 // import "k8s.io/api/autoscaling/v1"
+package v1
diff --git a/staging/src/k8s.io/api/autoscaling/v2/doc.go b/staging/src/k8s.io/api/autoscaling/v2/doc.go
index aafa2d4de2c..8dea6339dfb 100644
--- a/staging/src/k8s.io/api/autoscaling/v2/doc.go
+++ b/staging/src/k8s.io/api/autoscaling/v2/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
 
-package v2 // import "k8s.io/api/autoscaling/v2"
+package v2
diff --git a/staging/src/k8s.io/api/autoscaling/v2beta1/doc.go b/staging/src/k8s.io/api/autoscaling/v2beta1/doc.go
index 25ca507bba3..eac92e86e80 100644
--- a/staging/src/k8s.io/api/autoscaling/v2beta1/doc.go
+++ b/staging/src/k8s.io/api/autoscaling/v2beta1/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
 
-package v2beta1 // import "k8s.io/api/autoscaling/v2beta1"
+package v2beta1
diff --git a/staging/src/k8s.io/api/autoscaling/v2beta2/doc.go b/staging/src/k8s.io/api/autoscaling/v2beta2/doc.go
index 76fb0aff87b..1500372978d 100644
--- a/staging/src/k8s.io/api/autoscaling/v2beta2/doc.go
+++ b/staging/src/k8s.io/api/autoscaling/v2beta2/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
 
-package v2beta2 // import "k8s.io/api/autoscaling/v2beta2"
+package v2beta2
diff --git a/staging/src/k8s.io/api/batch/v1/doc.go b/staging/src/k8s.io/api/batch/v1/doc.go
index cb5cbb6002e..69088e2c5b8 100644
--- a/staging/src/k8s.io/api/batch/v1/doc.go
+++ b/staging/src/k8s.io/api/batch/v1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
-package v1 // import "k8s.io/api/batch/v1"
+package v1
diff --git a/staging/src/k8s.io/api/batch/v1beta1/doc.go b/staging/src/k8s.io/api/batch/v1beta1/doc.go
index cb2572f5dac..3430d6939d4 100644
--- a/staging/src/k8s.io/api/batch/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/batch/v1beta1/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
 
-package v1beta1 // import "k8s.io/api/batch/v1beta1"
+package v1beta1
diff --git a/staging/src/k8s.io/api/certificates/v1/doc.go b/staging/src/k8s.io/api/certificates/v1/doc.go
index 78434478e84..6c16fc29b87 100644
--- a/staging/src/k8s.io/api/certificates/v1/doc.go
+++ b/staging/src/k8s.io/api/certificates/v1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:prerelease-lifecycle-gen=true
 // +groupName=certificates.k8s.io
 
-package v1 // import "k8s.io/api/certificates/v1"
+package v1
diff --git a/staging/src/k8s.io/api/certificates/v1alpha1/doc.go b/staging/src/k8s.io/api/certificates/v1alpha1/doc.go
index d83d0e82076..01481df8e50 100644
--- a/staging/src/k8s.io/api/certificates/v1alpha1/doc.go
+++ b/staging/src/k8s.io/api/certificates/v1alpha1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=certificates.k8s.io
 
-package v1alpha1 // import "k8s.io/api/certificates/v1alpha1"
+package v1alpha1
diff --git a/staging/src/k8s.io/api/certificates/v1beta1/doc.go b/staging/src/k8s.io/api/certificates/v1beta1/doc.go
index 1165518c670..81608a554c4 100644
--- a/staging/src/k8s.io/api/certificates/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/certificates/v1beta1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=certificates.k8s.io
 
-package v1beta1 // import "k8s.io/api/certificates/v1beta1"
+package v1beta1
diff --git a/staging/src/k8s.io/api/coordination/v1/doc.go b/staging/src/k8s.io/api/coordination/v1/doc.go
index 9b2fbbda3ad..82ae6340c7d 100644
--- a/staging/src/k8s.io/api/coordination/v1/doc.go
+++ b/staging/src/k8s.io/api/coordination/v1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=coordination.k8s.io
 
-package v1 // import "k8s.io/api/coordination/v1"
+package v1
diff --git a/staging/src/k8s.io/api/coordination/v1alpha2/doc.go b/staging/src/k8s.io/api/coordination/v1alpha2/doc.go
index 5e6d655302e..dff7df47fc4 100644
--- a/staging/src/k8s.io/api/coordination/v1alpha2/doc.go
+++ b/staging/src/k8s.io/api/coordination/v1alpha2/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=coordination.k8s.io
 
-package v1alpha2 // import "k8s.io/api/coordination/v1alpha2"
+package v1alpha2
diff --git a/staging/src/k8s.io/api/coordination/v1beta1/doc.go b/staging/src/k8s.io/api/coordination/v1beta1/doc.go
index e733411aa96..cab8becf677 100644
--- a/staging/src/k8s.io/api/coordination/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/coordination/v1beta1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=coordination.k8s.io
 
-package v1beta1 // import "k8s.io/api/coordination/v1beta1"
+package v1beta1
diff --git a/staging/src/k8s.io/api/core/v1/doc.go b/staging/src/k8s.io/api/core/v1/doc.go
index bc0041b331a..e4e9196aebc 100644
--- a/staging/src/k8s.io/api/core/v1/doc.go
+++ b/staging/src/k8s.io/api/core/v1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 // +groupName=
 
 // Package v1 is the v1 version of the core API.
-package v1 // import "k8s.io/api/core/v1"
+package v1
diff --git a/staging/src/k8s.io/api/discovery/v1/doc.go b/staging/src/k8s.io/api/discovery/v1/doc.go
index 01913669fff..43e30b7f432 100644
--- a/staging/src/k8s.io/api/discovery/v1/doc.go
+++ b/staging/src/k8s.io/api/discovery/v1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:prerelease-lifecycle-gen=true
 // +groupName=discovery.k8s.io
 
-package v1 // import "k8s.io/api/discovery/v1"
+package v1
diff --git a/staging/src/k8s.io/api/discovery/v1beta1/doc.go b/staging/src/k8s.io/api/discovery/v1beta1/doc.go
index 7d7084802dc..f12087eff1b 100644
--- a/staging/src/k8s.io/api/discovery/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/discovery/v1beta1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:prerelease-lifecycle-gen=true
 // +groupName=discovery.k8s.io
 
-package v1beta1 // import "k8s.io/api/discovery/v1beta1"
+package v1beta1
diff --git a/staging/src/k8s.io/api/doc.go b/staging/src/k8s.io/api/doc.go
index 3248f7885cc..7d8f159323e 100644
--- a/staging/src/k8s.io/api/doc.go
+++ b/staging/src/k8s.io/api/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package api // import "k8s.io/api"
+package api
diff --git a/staging/src/k8s.io/api/events/v1/doc.go b/staging/src/k8s.io/api/events/v1/doc.go
index 5fe700ffcf8..911639044f8 100644
--- a/staging/src/k8s.io/api/events/v1/doc.go
+++ b/staging/src/k8s.io/api/events/v1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:prerelease-lifecycle-gen=true
 // +groupName=events.k8s.io
 
-package v1 // import "k8s.io/api/events/v1"
+package v1
diff --git a/staging/src/k8s.io/api/events/v1beta1/doc.go b/staging/src/k8s.io/api/events/v1beta1/doc.go
index 46048a65b4a..e4864294fd2 100644
--- a/staging/src/k8s.io/api/events/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/events/v1beta1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=events.k8s.io
 
-package v1beta1 // import "k8s.io/api/events/v1beta1"
+package v1beta1
diff --git a/staging/src/k8s.io/api/extensions/v1beta1/doc.go b/staging/src/k8s.io/api/extensions/v1beta1/doc.go
index c9af49d55c7..7770fab5d21 100644
--- a/staging/src/k8s.io/api/extensions/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/extensions/v1beta1/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
 
-package v1beta1 // import "k8s.io/api/extensions/v1beta1"
+package v1beta1
diff --git a/staging/src/k8s.io/api/flowcontrol/v1/doc.go b/staging/src/k8s.io/api/flowcontrol/v1/doc.go
index c9e7db15893..ad5f4579191 100644
--- a/staging/src/k8s.io/api/flowcontrol/v1/doc.go
+++ b/staging/src/k8s.io/api/flowcontrol/v1/doc.go
@@ -22,4 +22,4 @@ limitations under the License.
 // +groupName=flowcontrol.apiserver.k8s.io
 
 // Package v1 holds api types of version v1 for group "flowcontrol.apiserver.k8s.io".
-package v1 // import "k8s.io/api/flowcontrol/v1"
+package v1
diff --git a/staging/src/k8s.io/api/flowcontrol/v1beta1/doc.go b/staging/src/k8s.io/api/flowcontrol/v1beta1/doc.go
index 50897b7eb5a..20268c1f2da 100644
--- a/staging/src/k8s.io/api/flowcontrol/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/flowcontrol/v1beta1/doc.go
@@ -22,4 +22,4 @@ limitations under the License.
 // +groupName=flowcontrol.apiserver.k8s.io
 
 // Package v1beta1 holds api types of version v1alpha1 for group "flowcontrol.apiserver.k8s.io".
-package v1beta1 // import "k8s.io/api/flowcontrol/v1beta1"
+package v1beta1
diff --git a/staging/src/k8s.io/api/flowcontrol/v1beta2/doc.go b/staging/src/k8s.io/api/flowcontrol/v1beta2/doc.go
index 53b460d374d..2dcad11ad9a 100644
--- a/staging/src/k8s.io/api/flowcontrol/v1beta2/doc.go
+++ b/staging/src/k8s.io/api/flowcontrol/v1beta2/doc.go
@@ -22,4 +22,4 @@ limitations under the License.
 // +groupName=flowcontrol.apiserver.k8s.io
 
 // Package v1beta2 holds api types of version v1alpha1 for group "flowcontrol.apiserver.k8s.io".
-package v1beta2 // import "k8s.io/api/flowcontrol/v1beta2"
+package v1beta2
diff --git a/staging/src/k8s.io/api/flowcontrol/v1beta3/doc.go b/staging/src/k8s.io/api/flowcontrol/v1beta3/doc.go
index cd60cfef7fe..95f4430d383 100644
--- a/staging/src/k8s.io/api/flowcontrol/v1beta3/doc.go
+++ b/staging/src/k8s.io/api/flowcontrol/v1beta3/doc.go
@@ -22,4 +22,4 @@ limitations under the License.
 // +groupName=flowcontrol.apiserver.k8s.io
 
 // Package v1beta3 holds api types of version v1beta3 for group "flowcontrol.apiserver.k8s.io".
-package v1beta3 // import "k8s.io/api/flowcontrol/v1beta3"
+package v1beta3
diff --git a/staging/src/k8s.io/api/imagepolicy/v1alpha1/doc.go b/staging/src/k8s.io/api/imagepolicy/v1alpha1/doc.go
index 5db6d52d473..f5fbbdbf0c3 100644
--- a/staging/src/k8s.io/api/imagepolicy/v1alpha1/doc.go
+++ b/staging/src/k8s.io/api/imagepolicy/v1alpha1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 
 // +groupName=imagepolicy.k8s.io
 
-package v1alpha1 // import "k8s.io/api/imagepolicy/v1alpha1"
+package v1alpha1
diff --git a/staging/src/k8s.io/api/networking/v1/doc.go b/staging/src/k8s.io/api/networking/v1/doc.go
index 1d13e7bab31..e2093b7df67 100644
--- a/staging/src/k8s.io/api/networking/v1/doc.go
+++ b/staging/src/k8s.io/api/networking/v1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:prerelease-lifecycle-gen=true
 // +groupName=networking.k8s.io
 
-package v1 // import "k8s.io/api/networking/v1"
+package v1
diff --git a/staging/src/k8s.io/api/networking/v1alpha1/doc.go b/staging/src/k8s.io/api/networking/v1alpha1/doc.go
index 3827b0418f9..55264ae7075 100644
--- a/staging/src/k8s.io/api/networking/v1alpha1/doc.go
+++ b/staging/src/k8s.io/api/networking/v1alpha1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:prerelease-lifecycle-gen=true
 // +groupName=networking.k8s.io
 
-package v1alpha1 // import "k8s.io/api/networking/v1alpha1"
+package v1alpha1
diff --git a/staging/src/k8s.io/api/networking/v1beta1/doc.go b/staging/src/k8s.io/api/networking/v1beta1/doc.go
index fa6d01cea0c..c5a03e04e8a 100644
--- a/staging/src/k8s.io/api/networking/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/networking/v1beta1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:prerelease-lifecycle-gen=true
 // +groupName=networking.k8s.io
 
-package v1beta1 // import "k8s.io/api/networking/v1beta1"
+package v1beta1
diff --git a/staging/src/k8s.io/api/node/v1/doc.go b/staging/src/k8s.io/api/node/v1/doc.go
index 57ca52445bd..3239af70399 100644
--- a/staging/src/k8s.io/api/node/v1/doc.go
+++ b/staging/src/k8s.io/api/node/v1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:prerelease-lifecycle-gen=true
 // +groupName=node.k8s.io
 
-package v1 // import "k8s.io/api/node/v1"
+package v1
diff --git a/staging/src/k8s.io/api/node/v1alpha1/doc.go b/staging/src/k8s.io/api/node/v1alpha1/doc.go
index dfe99540b53..2f3d46ac205 100644
--- a/staging/src/k8s.io/api/node/v1alpha1/doc.go
+++ b/staging/src/k8s.io/api/node/v1alpha1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 
 // +groupName=node.k8s.io
 
-package v1alpha1 // import "k8s.io/api/node/v1alpha1"
+package v1alpha1
diff --git a/staging/src/k8s.io/api/node/v1beta1/doc.go b/staging/src/k8s.io/api/node/v1beta1/doc.go
index c76ba89c48f..7b47c8df666 100644
--- a/staging/src/k8s.io/api/node/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/node/v1beta1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=node.k8s.io
 
-package v1beta1 // import "k8s.io/api/node/v1beta1"
+package v1beta1
diff --git a/staging/src/k8s.io/api/policy/v1/doc.go b/staging/src/k8s.io/api/policy/v1/doc.go
index c51e02685ab..ff47e7fd492 100644
--- a/staging/src/k8s.io/api/policy/v1/doc.go
+++ b/staging/src/k8s.io/api/policy/v1/doc.go
@@ -22,4 +22,4 @@ limitations under the License.
 // Package policy is for any kind of policy object.  Suitable examples, even if
 // they aren't all here, are PodDisruptionBudget,
 // NetworkPolicy, etc.
-package v1 // import "k8s.io/api/policy/v1"
+package v1
diff --git a/staging/src/k8s.io/api/policy/v1beta1/doc.go b/staging/src/k8s.io/api/policy/v1beta1/doc.go
index 76da54b4c73..777106c6002 100644
--- a/staging/src/k8s.io/api/policy/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/policy/v1beta1/doc.go
@@ -22,4 +22,4 @@ limitations under the License.
 // Package policy is for any kind of policy object.  Suitable examples, even if
 // they aren't all here, are PodDisruptionBudget,
 // NetworkPolicy, etc.
-package v1beta1 // import "k8s.io/api/policy/v1beta1"
+package v1beta1
diff --git a/staging/src/k8s.io/api/rbac/v1/doc.go b/staging/src/k8s.io/api/rbac/v1/doc.go
index b0e4e5b5b58..408546274b0 100644
--- a/staging/src/k8s.io/api/rbac/v1/doc.go
+++ b/staging/src/k8s.io/api/rbac/v1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:prerelease-lifecycle-gen=true
 // +groupName=rbac.authorization.k8s.io
 
-package v1 // import "k8s.io/api/rbac/v1"
+package v1
diff --git a/staging/src/k8s.io/api/rbac/v1alpha1/doc.go b/staging/src/k8s.io/api/rbac/v1alpha1/doc.go
index 918b8a337c7..70d3c0e9718 100644
--- a/staging/src/k8s.io/api/rbac/v1alpha1/doc.go
+++ b/staging/src/k8s.io/api/rbac/v1alpha1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 
 // +groupName=rbac.authorization.k8s.io
 
-package v1alpha1 // import "k8s.io/api/rbac/v1alpha1"
+package v1alpha1
diff --git a/staging/src/k8s.io/api/rbac/v1beta1/doc.go b/staging/src/k8s.io/api/rbac/v1beta1/doc.go
index 156f273e692..504a58d8bfa 100644
--- a/staging/src/k8s.io/api/rbac/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/rbac/v1beta1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=rbac.authorization.k8s.io
 
-package v1beta1 // import "k8s.io/api/rbac/v1beta1"
+package v1beta1
diff --git a/staging/src/k8s.io/api/resource/v1alpha3/doc.go b/staging/src/k8s.io/api/resource/v1alpha3/doc.go
index ffc21307d0f..82e64f1d00c 100644
--- a/staging/src/k8s.io/api/resource/v1alpha3/doc.go
+++ b/staging/src/k8s.io/api/resource/v1alpha3/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 // +groupName=resource.k8s.io
 
 // Package v1alpha3 is the v1alpha3 version of the resource API.
-package v1alpha3 // import "k8s.io/api/resource/v1alpha3"
+package v1alpha3
diff --git a/staging/src/k8s.io/api/resource/v1beta1/doc.go b/staging/src/k8s.io/api/resource/v1beta1/doc.go
index 88c35c6ca74..1e08b69a175 100644
--- a/staging/src/k8s.io/api/resource/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/resource/v1beta1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 // +groupName=resource.k8s.io
 
 // Package v1beta1 is the v1beta1 version of the resource API.
-package v1beta1 // import "k8s.io/api/resource/v1beta1"
+package v1beta1
diff --git a/staging/src/k8s.io/api/scheduling/v1/doc.go b/staging/src/k8s.io/api/scheduling/v1/doc.go
index ee3c6684718..c587bee9ea5 100644
--- a/staging/src/k8s.io/api/scheduling/v1/doc.go
+++ b/staging/src/k8s.io/api/scheduling/v1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:prerelease-lifecycle-gen=true
 // +groupName=scheduling.k8s.io
 
-package v1 // import "k8s.io/api/scheduling/v1"
+package v1
diff --git a/staging/src/k8s.io/api/scheduling/v1alpha1/doc.go b/staging/src/k8s.io/api/scheduling/v1alpha1/doc.go
index cff47e1f4a0..476ab6f66c1 100644
--- a/staging/src/k8s.io/api/scheduling/v1alpha1/doc.go
+++ b/staging/src/k8s.io/api/scheduling/v1alpha1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 
 // +groupName=scheduling.k8s.io
 
-package v1alpha1 // import "k8s.io/api/scheduling/v1alpha1"
+package v1alpha1
diff --git a/staging/src/k8s.io/api/scheduling/v1beta1/doc.go b/staging/src/k8s.io/api/scheduling/v1beta1/doc.go
index 152d241fbd1..1bc36106116 100644
--- a/staging/src/k8s.io/api/scheduling/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/scheduling/v1beta1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=scheduling.k8s.io
 
-package v1beta1 // import "k8s.io/api/scheduling/v1beta1"
+package v1beta1
diff --git a/staging/src/k8s.io/api/storage/v1/doc.go b/staging/src/k8s.io/api/storage/v1/doc.go
index e2310dac23a..162a99522e5 100644
--- a/staging/src/k8s.io/api/storage/v1/doc.go
+++ b/staging/src/k8s.io/api/storage/v1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
 
-package v1 // import "k8s.io/api/storage/v1"
+package v1
diff --git a/staging/src/k8s.io/api/storage/v1alpha1/doc.go b/staging/src/k8s.io/api/storage/v1alpha1/doc.go
index 87440b47aef..90af522ade3 100644
--- a/staging/src/k8s.io/api/storage/v1alpha1/doc.go
+++ b/staging/src/k8s.io/api/storage/v1alpha1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
 
-package v1alpha1 // import "k8s.io/api/storage/v1alpha1"
+package v1alpha1
diff --git a/staging/src/k8s.io/api/storage/v1beta1/doc.go b/staging/src/k8s.io/api/storage/v1beta1/doc.go
index 75142a62fb0..174482b6092 100644
--- a/staging/src/k8s.io/api/storage/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/storage/v1beta1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
 
-package v1beta1 // import "k8s.io/api/storage/v1beta1"
+package v1beta1
diff --git a/staging/src/k8s.io/api/storagemigration/v1alpha1/doc.go b/staging/src/k8s.io/api/storagemigration/v1alpha1/doc.go
index 192f9ff3c3c..df8f3a65d45 100644
--- a/staging/src/k8s.io/api/storagemigration/v1alpha1/doc.go
+++ b/staging/src/k8s.io/api/storagemigration/v1alpha1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:prerelease-lifecycle-gen=true
 // +groupName=storagemigration.k8s.io
 
-package v1alpha1 // import "k8s.io/api/storagemigration/v1alpha1"
+package v1alpha1
diff --git a/staging/src/k8s.io/apiextensions-apiserver/examples/client-go/pkg/apis/cr/v1/doc.go b/staging/src/k8s.io/apiextensions-apiserver/examples/client-go/pkg/apis/cr/v1/doc.go
index d25f44d1da6..d58bcc1e620 100644
--- a/staging/src/k8s.io/apiextensions-apiserver/examples/client-go/pkg/apis/cr/v1/doc.go
+++ b/staging/src/k8s.io/apiextensions-apiserver/examples/client-go/pkg/apis/cr/v1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +groupName=cr.example.apiextensions.k8s.io
 
 // Package v1 is the v1 version of the API.
-package v1 // import "k8s.io/apiextensions-apiserver/examples/client-go/pkg/apis/cr/v1"
+package v1
diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/doc.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/doc.go
index 2a6b02dccd2..3f017ff42ad 100644
--- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/doc.go
+++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +groupName=apiextensions.k8s.io
 
 // Package apiextensions is the internal version of the API.
-package apiextensions // import "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
+package apiextensions
diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/doc.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/doc.go
index c7be07a1431..39e70bb035a 100644
--- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/doc.go
+++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/doc.go
@@ -23,4 +23,4 @@ limitations under the License.
 // +groupName=apiextensions.k8s.io
 
 // Package v1 is the v1 version of the API.
-package v1 // import "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+package v1
diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/doc.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/doc.go
index 7a92cb8b0c6..6ddea3e0140 100644
--- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/doc.go
+++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/doc.go
@@ -23,4 +23,4 @@ limitations under the License.
 // +groupName=apiextensions.k8s.io
 
 // Package v1beta1 is the v1beta1 version of the API.
-package v1beta1 // import "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+package v1beta1
diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/generated/openapi/doc.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/generated/openapi/doc.go
index 255c1e4e26c..5e6851f5470 100644
--- a/staging/src/k8s.io/apiextensions-apiserver/pkg/generated/openapi/doc.go
+++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/generated/openapi/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // openapi generated definitions.
-package openapi // import "k8s.io/apiextensions-apiserver/pkg/generated/openapi"
+package openapi
diff --git a/staging/src/k8s.io/apimachinery/doc.go b/staging/src/k8s.io/apimachinery/doc.go
index 23f56769909..1659a0fa6e3 100644
--- a/staging/src/k8s.io/apimachinery/doc.go
+++ b/staging/src/k8s.io/apimachinery/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package apimachinery // import "k8s.io/apimachinery"
+package apimachinery
diff --git a/staging/src/k8s.io/apimachinery/pkg/api/errors/doc.go b/staging/src/k8s.io/apimachinery/pkg/api/errors/doc.go
index 167baf680d2..58751ed0ec8 100644
--- a/staging/src/k8s.io/apimachinery/pkg/api/errors/doc.go
+++ b/staging/src/k8s.io/apimachinery/pkg/api/errors/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package errors provides detailed error types for api field validation.
-package errors // import "k8s.io/apimachinery/pkg/api/errors"
+package errors
diff --git a/staging/src/k8s.io/apimachinery/pkg/api/meta/doc.go b/staging/src/k8s.io/apimachinery/pkg/api/meta/doc.go
index b6d42acf8fb..a3b18a5c9aa 100644
--- a/staging/src/k8s.io/apimachinery/pkg/api/meta/doc.go
+++ b/staging/src/k8s.io/apimachinery/pkg/api/meta/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package meta provides functions for retrieving API metadata from objects
 // belonging to the Kubernetes API
-package meta // import "k8s.io/apimachinery/pkg/api/meta"
+package meta
diff --git a/staging/src/k8s.io/apimachinery/pkg/api/validation/doc.go b/staging/src/k8s.io/apimachinery/pkg/api/validation/doc.go
index 9f20152e452..9e305b0b181 100644
--- a/staging/src/k8s.io/apimachinery/pkg/api/validation/doc.go
+++ b/staging/src/k8s.io/apimachinery/pkg/api/validation/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package validation contains generic api type validation functions.
-package validation // import "k8s.io/apimachinery/pkg/api/validation"
+package validation
diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion/doc.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion/doc.go
index 2741ee2c805..1e85c5c43da 100644
--- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion/doc.go
+++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +k8s:conversion-gen=k8s.io/apimachinery/pkg/apis/meta/v1
 
-package internalversion // import "k8s.io/apimachinery/pkg/apis/meta/internalversion"
+package internalversion
diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion/scheme/doc.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion/scheme/doc.go
index a45fa2a8a55..b5ce956ee55 100644
--- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion/scheme/doc.go
+++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion/scheme/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package scheme // import "k8s.io/apimachinery/pkg/apis/meta/internalversion/scheme"
+package scheme
diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/doc.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/doc.go
index 7736753d668..617b9a5d30f 100644
--- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/doc.go
+++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=meta.k8s.io
 
-package v1 // import "k8s.io/apimachinery/pkg/apis/meta/v1"
+package v1
diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/doc.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/doc.go
index 20c9d2ec737..46b0e133c37 100644
--- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/doc.go
+++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 
 // +groupName=meta.k8s.io
 
-package v1beta1 // import "k8s.io/apimachinery/pkg/apis/meta/v1beta1"
+package v1beta1
diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/doc.go b/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/doc.go
index 419d0cb4659..4307afaf35f 100644
--- a/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/doc.go
+++ b/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 //
 // package testapigroup contains an testapigroup API used to demonstrate how to create api groups. Moreover, this is
 // used within tests.
-package testapigroup // import "k8s.io/apimachinery/pkg/apis/testapigroup"
+package testapigroup
diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/v1/doc.go b/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/v1/doc.go
index 5c872fdbf30..9e998c1924f 100644
--- a/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/v1/doc.go
+++ b/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/v1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=testapigroup.apimachinery.k8s.io
 
-package v1 // import "k8s.io/apimachinery/pkg/apis/testapigroup/v1"
+package v1
diff --git a/staging/src/k8s.io/apimachinery/pkg/conversion/doc.go b/staging/src/k8s.io/apimachinery/pkg/conversion/doc.go
index 7415d81646b..0c46ef2d169 100644
--- a/staging/src/k8s.io/apimachinery/pkg/conversion/doc.go
+++ b/staging/src/k8s.io/apimachinery/pkg/conversion/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 // but for the fields which did not change, copying is automated. This makes it
 // easy to modify the structures you use in memory without affecting the format
 // you store on disk or respond to in your external API calls.
-package conversion // import "k8s.io/apimachinery/pkg/conversion"
+package conversion
diff --git a/staging/src/k8s.io/apimachinery/pkg/conversion/queryparams/doc.go b/staging/src/k8s.io/apimachinery/pkg/conversion/queryparams/doc.go
index 7b763de6f01..4c1002a4c1d 100644
--- a/staging/src/k8s.io/apimachinery/pkg/conversion/queryparams/doc.go
+++ b/staging/src/k8s.io/apimachinery/pkg/conversion/queryparams/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package queryparams provides conversion from versioned
 // runtime objects to URL query values
-package queryparams // import "k8s.io/apimachinery/pkg/conversion/queryparams"
+package queryparams
diff --git a/staging/src/k8s.io/apimachinery/pkg/fields/doc.go b/staging/src/k8s.io/apimachinery/pkg/fields/doc.go
index c39b8039ae7..49059e26352 100644
--- a/staging/src/k8s.io/apimachinery/pkg/fields/doc.go
+++ b/staging/src/k8s.io/apimachinery/pkg/fields/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package fields implements a simple field system, parsing and matching
 // selectors with sets of fields.
-package fields // import "k8s.io/apimachinery/pkg/fields"
+package fields
diff --git a/staging/src/k8s.io/apimachinery/pkg/labels/doc.go b/staging/src/k8s.io/apimachinery/pkg/labels/doc.go
index 82de0051bd6..35ba7880944 100644
--- a/staging/src/k8s.io/apimachinery/pkg/labels/doc.go
+++ b/staging/src/k8s.io/apimachinery/pkg/labels/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package labels implements a simple label system, parsing and matching
 // selectors with sets of labels.
-package labels // import "k8s.io/apimachinery/pkg/labels"
+package labels
diff --git a/staging/src/k8s.io/apimachinery/pkg/runtime/doc.go b/staging/src/k8s.io/apimachinery/pkg/runtime/doc.go
index 89feb40103e..b54429bd89c 100644
--- a/staging/src/k8s.io/apimachinery/pkg/runtime/doc.go
+++ b/staging/src/k8s.io/apimachinery/pkg/runtime/doc.go
@@ -48,4 +48,4 @@ limitations under the License.
 //
 // As a bonus, a few common types useful from all api objects and versions
 // are provided in types.go.
-package runtime // import "k8s.io/apimachinery/pkg/runtime"
+package runtime
diff --git a/staging/src/k8s.io/apimachinery/pkg/runtime/serializer/protobuf/doc.go b/staging/src/k8s.io/apimachinery/pkg/runtime/serializer/protobuf/doc.go
index 72d0ac79b34..381748d69fd 100644
--- a/staging/src/k8s.io/apimachinery/pkg/runtime/serializer/protobuf/doc.go
+++ b/staging/src/k8s.io/apimachinery/pkg/runtime/serializer/protobuf/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package protobuf provides a Kubernetes serializer for the protobuf format.
-package protobuf // import "k8s.io/apimachinery/pkg/runtime/serializer/protobuf"
+package protobuf
diff --git a/staging/src/k8s.io/apimachinery/pkg/runtime/testing/doc.go b/staging/src/k8s.io/apimachinery/pkg/runtime/testing/doc.go
index 11ee724b7f2..a4903278543 100644
--- a/staging/src/k8s.io/apimachinery/pkg/runtime/testing/doc.go
+++ b/staging/src/k8s.io/apimachinery/pkg/runtime/testing/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package testing // import "k8s.io/apimachinery/pkg/runtime/testing"
+package testing
diff --git a/staging/src/k8s.io/apimachinery/pkg/types/doc.go b/staging/src/k8s.io/apimachinery/pkg/types/doc.go
index 5667fa99212..783cbcdc8db 100644
--- a/staging/src/k8s.io/apimachinery/pkg/types/doc.go
+++ b/staging/src/k8s.io/apimachinery/pkg/types/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package types implements various generic types used throughout kubernetes.
-package types // import "k8s.io/apimachinery/pkg/types"
+package types
diff --git a/staging/src/k8s.io/apimachinery/pkg/util/errors/doc.go b/staging/src/k8s.io/apimachinery/pkg/util/errors/doc.go
index 5d4d6250a31..b3b39bc388f 100644
--- a/staging/src/k8s.io/apimachinery/pkg/util/errors/doc.go
+++ b/staging/src/k8s.io/apimachinery/pkg/util/errors/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package errors implements various utility functions and types around errors.
-package errors // import "k8s.io/apimachinery/pkg/util/errors"
+package errors
diff --git a/staging/src/k8s.io/apimachinery/pkg/util/httpstream/doc.go b/staging/src/k8s.io/apimachinery/pkg/util/httpstream/doc.go
index 5893df5bd26..1da83f14b18 100644
--- a/staging/src/k8s.io/apimachinery/pkg/util/httpstream/doc.go
+++ b/staging/src/k8s.io/apimachinery/pkg/util/httpstream/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package httpstream adds multiplexed streaming support to HTTP requests and
 // responses via connection upgrades.
-package httpstream // import "k8s.io/apimachinery/pkg/util/httpstream"
+package httpstream
diff --git a/staging/src/k8s.io/apimachinery/pkg/util/httpstream/wsstream/doc.go b/staging/src/k8s.io/apimachinery/pkg/util/httpstream/wsstream/doc.go
index 3dd6f828b70..a57e8df60a3 100644
--- a/staging/src/k8s.io/apimachinery/pkg/util/httpstream/wsstream/doc.go
+++ b/staging/src/k8s.io/apimachinery/pkg/util/httpstream/wsstream/doc.go
@@ -66,4 +66,4 @@ limitations under the License.
 //	WRITE []byte{0, 102, 111, 111, 10} # send "foo\n" on channel 0 (STDIN)
 //	WRITE []byte{255, 0}               # send CLOSE signal (STDIN)
 //	CLOSE
-package wsstream // import "k8s.io/apimachinery/pkg/util/httpstream/wsstream"
+package wsstream
diff --git a/staging/src/k8s.io/apimachinery/pkg/util/proxy/doc.go b/staging/src/k8s.io/apimachinery/pkg/util/proxy/doc.go
index d14ecfad544..ea710f6b159 100644
--- a/staging/src/k8s.io/apimachinery/pkg/util/proxy/doc.go
+++ b/staging/src/k8s.io/apimachinery/pkg/util/proxy/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package proxy provides transport and upgrade support for proxies.
-package proxy // import "k8s.io/apimachinery/pkg/util/proxy"
+package proxy
diff --git a/staging/src/k8s.io/apimachinery/pkg/util/sets/doc.go b/staging/src/k8s.io/apimachinery/pkg/util/sets/doc.go
index fd281bdb88c..194883390cf 100644
--- a/staging/src/k8s.io/apimachinery/pkg/util/sets/doc.go
+++ b/staging/src/k8s.io/apimachinery/pkg/util/sets/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package sets has generic set and specified sets. Generic set will
 // replace specified ones over time. And specific ones are deprecated.
-package sets // import "k8s.io/apimachinery/pkg/util/sets"
+package sets
diff --git a/staging/src/k8s.io/apimachinery/pkg/util/version/doc.go b/staging/src/k8s.io/apimachinery/pkg/util/version/doc.go
index 5b2b22b6d00..da88813da2d 100644
--- a/staging/src/k8s.io/apimachinery/pkg/util/version/doc.go
+++ b/staging/src/k8s.io/apimachinery/pkg/util/version/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package version provides utilities for version number comparisons
-package version // import "k8s.io/apimachinery/pkg/util/version"
+package version
diff --git a/staging/src/k8s.io/apimachinery/pkg/util/wait/doc.go b/staging/src/k8s.io/apimachinery/pkg/util/wait/doc.go
index 3f0c968ec9f..ff89dc170e8 100644
--- a/staging/src/k8s.io/apimachinery/pkg/util/wait/doc.go
+++ b/staging/src/k8s.io/apimachinery/pkg/util/wait/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package wait provides tools for polling or listening for changes
 // to a condition.
-package wait // import "k8s.io/apimachinery/pkg/util/wait"
+package wait
diff --git a/staging/src/k8s.io/apimachinery/pkg/util/waitgroup/doc.go b/staging/src/k8s.io/apimachinery/pkg/util/waitgroup/doc.go
index a6f29cd7c4d..6eb7903a73b 100644
--- a/staging/src/k8s.io/apimachinery/pkg/util/waitgroup/doc.go
+++ b/staging/src/k8s.io/apimachinery/pkg/util/waitgroup/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package waitgroup implements SafeWaitGroup wrap of sync.WaitGroup.
 // Add with positive delta when waiting will fail, to prevent sync.WaitGroup race issue.
-package waitgroup // import "k8s.io/apimachinery/pkg/util/waitgroup"
+package waitgroup
diff --git a/staging/src/k8s.io/apimachinery/pkg/version/doc.go b/staging/src/k8s.io/apimachinery/pkg/version/doc.go
index 29574fd6d58..e64ad36ed25 100644
--- a/staging/src/k8s.io/apimachinery/pkg/version/doc.go
+++ b/staging/src/k8s.io/apimachinery/pkg/version/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:openapi-gen=true
 
 // Package version supplies the type for version information collected at build time.
-package version // import "k8s.io/apimachinery/pkg/version"
+package version
diff --git a/staging/src/k8s.io/apimachinery/pkg/watch/doc.go b/staging/src/k8s.io/apimachinery/pkg/watch/doc.go
index 7e6bf3fb95d..5fde5e7427a 100644
--- a/staging/src/k8s.io/apimachinery/pkg/watch/doc.go
+++ b/staging/src/k8s.io/apimachinery/pkg/watch/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package watch contains a generic watchable interface, and a fake for
 // testing code that uses the watch interface.
-package watch // import "k8s.io/apimachinery/pkg/watch"
+package watch
diff --git a/staging/src/k8s.io/apiserver/doc.go b/staging/src/k8s.io/apiserver/doc.go
index be78efac8ed..573d9e39b7c 100644
--- a/staging/src/k8s.io/apiserver/doc.go
+++ b/staging/src/k8s.io/apiserver/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package apiserver // import "k8s.io/apiserver"
+package apiserver
diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/resourcequota/apis/resourcequota/doc.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/resourcequota/apis/resourcequota/doc.go
index b8c0ea047c2..dad2f7fdea9 100644
--- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/resourcequota/apis/resourcequota/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/resourcequota/apis/resourcequota/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package resourcequota // import "k8s.io/apiserver/pkg/admission/plugin/resourcequota/apis/resourcequota"
+package resourcequota
diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/resourcequota/apis/resourcequota/v1/doc.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/resourcequota/apis/resourcequota/v1/doc.go
index 4eaeff77adf..22174fc0496 100644
--- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/resourcequota/apis/resourcequota/v1/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/resourcequota/apis/resourcequota/v1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +groupName=resourcequota.admission.k8s.io
 
 // Package v1 is the v1 version of the API.
-package v1 // import "k8s.io/apiserver/pkg/admission/plugin/resourcequota/apis/resourcequota/v1"
+package v1
diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/resourcequota/apis/resourcequota/v1alpha1/doc.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/resourcequota/apis/resourcequota/v1alpha1/doc.go
index b1c83e40dfb..707004c81f5 100644
--- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/resourcequota/apis/resourcequota/v1alpha1/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/resourcequota/apis/resourcequota/v1alpha1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +groupName=resourcequota.admission.k8s.io
 
 // Package v1alpha1 is the v1alpha1 version of the API.
-package v1alpha1 // import "k8s.io/apiserver/pkg/admission/plugin/resourcequota/apis/resourcequota/v1alpha1"
+package v1alpha1
diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/resourcequota/apis/resourcequota/v1beta1/doc.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/resourcequota/apis/resourcequota/v1beta1/doc.go
index 6d94d774c7d..f91e3eee228 100644
--- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/resourcequota/apis/resourcequota/v1beta1/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/resourcequota/apis/resourcequota/v1beta1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +groupName=resourcequota.admission.k8s.io
 
 // Package v1beta1 is the v1beta1 version of the API.
-package v1beta1 // import "k8s.io/apiserver/pkg/admission/plugin/resourcequota/apis/resourcequota/v1beta1"
+package v1beta1
diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/resourcequota/doc.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/resourcequota/doc.go
index 4436e33035b..242f8455ac5 100644
--- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/resourcequota/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/resourcequota/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package resourcequota enforces all incoming requests against any applied quota
 // in the namespace context of the request
-package resourcequota // import "k8s.io/apiserver/pkg/admission/plugin/resourcequota"
+package resourcequota
diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission/doc.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission/doc.go
index 087162e36ae..63ab310393c 100644
--- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package webhookadmission // import "k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission"
+package webhookadmission
diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission/v1/doc.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission/v1/doc.go
index 58875a59f20..92cfed10744 100644
--- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission/v1/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission/v1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +groupName=apiserver.config.k8s.io
 
 // Package v1 is the v1 version of the API.
-package v1 // import "k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission/v1"
+package v1
diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission/v1alpha1/doc.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission/v1alpha1/doc.go
index c8ee58d5d9a..703f467f9fc 100644
--- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission/v1alpha1/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission/v1alpha1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +groupName=apiserver.config.k8s.io
 
 // Package v1alpha1 is the v1alpha1 version of the API.
-package v1alpha1 // import "k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission/v1alpha1"
+package v1alpha1
diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/errors/doc.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/errors/doc.go
index 6e86a1b5f20..cac04f5b26c 100644
--- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/errors/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/errors/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package errors contains utilities for admission webhook specific errors
-package errors // import "k8s.io/apiserver/pkg/admission/plugin/webhook/errors"
+package errors
diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/mutating/doc.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/mutating/doc.go
index d804aca1cfc..664a9a69a35 100644
--- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/mutating/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/mutating/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package mutating makes calls to mutating webhooks during the admission
 // process.
-package mutating // import "k8s.io/apiserver/pkg/admission/plugin/webhook/mutating"
+package mutating
diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/predicates/namespace/doc.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/predicates/namespace/doc.go
index 660001dff78..6899b55d83a 100644
--- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/predicates/namespace/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/predicates/namespace/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // Package namespace defines the utilities that are used by the webhook
 // plugin to decide if a webhook should be applied to an object based on its
 // namespace.
-package namespace // import "k8s.io/apiserver/pkg/admission/plugin/webhook/predicates/namespace"
+package namespace
diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/predicates/object/doc.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/predicates/object/doc.go
index 8964afa6c5f..8dc71abbaa7 100644
--- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/predicates/object/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/predicates/object/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // Package object defines the utilities that are used by the webhook plugin to
 // decide if a webhook should run, as long as either the old object or the new
 // object has labels matching the webhook config's objectSelector.
-package object // import "k8s.io/apiserver/pkg/admission/plugin/webhook/predicates/object"
+package object
diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/request/doc.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/request/doc.go
index fbacf337178..8e207e6271e 100644
--- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/request/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/request/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package request creates admissionReview request based on admission attributes.
-package request // import "k8s.io/apiserver/pkg/admission/plugin/webhook/request"
+package request
diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/testcerts/doc.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/testcerts/doc.go
index a06fe3a6f8f..500859ab888 100644
--- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/testcerts/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/testcerts/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package testcerts contains generated key pairs used by the unit tests of
 // mutating and validating webhooks. They are for testing only.
-package testcerts // import "k8s.io/apiserver/pkg/admission/plugin/webhook/testcerts"
+package testcerts
diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/validating/doc.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/validating/doc.go
index ede53c668f2..1dcc4b696f5 100644
--- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/validating/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/validating/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package validating makes calls to validating (i.e., non-mutating) webhooks
 // during the admission process.
-package validating // import "k8s.io/apiserver/pkg/admission/plugin/webhook/validating"
+package validating
diff --git a/staging/src/k8s.io/apiserver/pkg/apis/apidiscovery/v2/doc.go b/staging/src/k8s.io/apiserver/pkg/apis/apidiscovery/v2/doc.go
index 579dc0bb25e..814fb255592 100644
--- a/staging/src/k8s.io/apiserver/pkg/apis/apidiscovery/v2/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/apis/apidiscovery/v2/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +groupName=apidiscovery.k8s.io
 
-package v2 // import "k8s.io/apiserver/pkg/apis/apidiscovery/v2"
+package v2
diff --git a/staging/src/k8s.io/apiserver/pkg/apis/apidiscovery/v2beta1/doc.go b/staging/src/k8s.io/apiserver/pkg/apis/apidiscovery/v2beta1/doc.go
index 1a3142bad2e..feebb242284 100644
--- a/staging/src/k8s.io/apiserver/pkg/apis/apidiscovery/v2beta1/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/apis/apidiscovery/v2beta1/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +groupName=apidiscovery.k8s.io
 
-package v2beta1 // import "k8s.io/apiserver/pkg/apis/apidiscovery/v2beta1"
+package v2beta1
diff --git a/staging/src/k8s.io/apiserver/pkg/apis/apiserver/doc.go b/staging/src/k8s.io/apiserver/pkg/apis/apiserver/doc.go
index 88db1ffa67a..1902ea64505 100644
--- a/staging/src/k8s.io/apiserver/pkg/apis/apiserver/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/apis/apiserver/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +groupName=apiserver.k8s.io
 
 // Package apiserver is the internal version of the API.
-package apiserver // import "k8s.io/apiserver/pkg/apis/apiserver"
+package apiserver
diff --git a/staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1/doc.go b/staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1/doc.go
index 91458aee4e8..6bd9e6bb15d 100644
--- a/staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +groupName=apiserver.config.k8s.io
 
 // Package v1 is the v1 version of the API.
-package v1 // import "k8s.io/apiserver/pkg/apis/apiserver/v1"
+package v1
diff --git a/staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1alpha1/doc.go b/staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1alpha1/doc.go
index c9b658b22ac..d5277f18293 100644
--- a/staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1alpha1/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1alpha1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 // +groupName=apiserver.config.k8s.io
 
 // Package v1alpha1 is the v1alpha1 version of the API.
-package v1alpha1 // import "k8s.io/apiserver/pkg/apis/apiserver/v1alpha1"
+package v1alpha1
diff --git a/staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1beta1/doc.go b/staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1beta1/doc.go
index 07321e775d2..39c0efc9304 100644
--- a/staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1beta1/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1beta1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +groupName=apiserver.k8s.io
 
 // Package v1beta1 is the v1beta1 version of the API.
-package v1beta1 // import "k8s.io/apiserver/pkg/apis/apiserver/v1beta1"
+package v1beta1
diff --git a/staging/src/k8s.io/apiserver/pkg/apis/audit/doc.go b/staging/src/k8s.io/apiserver/pkg/apis/audit/doc.go
index deda9cbd63c..90b516b348c 100644
--- a/staging/src/k8s.io/apiserver/pkg/apis/audit/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/apis/audit/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +groupName=audit.k8s.io
 
-package audit // import "k8s.io/apiserver/pkg/apis/audit"
+package audit
diff --git a/staging/src/k8s.io/apiserver/pkg/apis/audit/v1/doc.go b/staging/src/k8s.io/apiserver/pkg/apis/audit/v1/doc.go
index d1f180c942a..6c719b84729 100644
--- a/staging/src/k8s.io/apiserver/pkg/apis/audit/v1/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/apis/audit/v1/doc.go
@@ -22,4 +22,4 @@ limitations under the License.
 
 // +groupName=audit.k8s.io
 
-package v1 // import "k8s.io/apiserver/pkg/apis/audit/v1"
+package v1
diff --git a/staging/src/k8s.io/apiserver/pkg/apis/example/doc.go b/staging/src/k8s.io/apiserver/pkg/apis/example/doc.go
index d8b341a395b..2e29764349d 100644
--- a/staging/src/k8s.io/apiserver/pkg/apis/example/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/apis/example/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 
 // package example contains an example API used to demonstrate how to create api groups. Moreover, this is
 // used within tests.
-package example // import "k8s.io/apiserver/pkg/apis/example"
+package example
diff --git a/staging/src/k8s.io/apiserver/pkg/apis/example/v1/doc.go b/staging/src/k8s.io/apiserver/pkg/apis/example/v1/doc.go
index ab15774a384..512ca4b34d0 100644
--- a/staging/src/k8s.io/apiserver/pkg/apis/example/v1/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/apis/example/v1/doc.go
@@ -22,4 +22,4 @@ limitations under the License.
 
 // +groupName=example.apiserver.k8s.io
 
-package v1 // import "k8s.io/apiserver/pkg/apis/example/v1"
+package v1
diff --git a/staging/src/k8s.io/apiserver/pkg/apis/example2/doc.go b/staging/src/k8s.io/apiserver/pkg/apis/example2/doc.go
index ae0ecc109ea..2953e9276ed 100644
--- a/staging/src/k8s.io/apiserver/pkg/apis/example2/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/apis/example2/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 // another group ("example"). This happens if a type is moved to a different
 // group. It's not recommended to move types across groups, though Kubernetes
 // have a few cases due to historical reasons. This package is for tests.
-package example2 // import "k8s.io/apiserver/pkg/apis/example2"
+package example2
diff --git a/staging/src/k8s.io/apiserver/pkg/apis/example2/v1/doc.go b/staging/src/k8s.io/apiserver/pkg/apis/example2/v1/doc.go
index 18ebeaddc85..f5be37969cf 100644
--- a/staging/src/k8s.io/apiserver/pkg/apis/example2/v1/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/apis/example2/v1/doc.go
@@ -23,4 +23,4 @@ limitations under the License.
 
 // +groupName=example2.apiserver.k8s.io
 
-package v1 // import "k8s.io/apiserver/pkg/apis/example2/v1"
+package v1
diff --git a/staging/src/k8s.io/apiserver/pkg/authentication/request/x509/doc.go b/staging/src/k8s.io/apiserver/pkg/authentication/request/x509/doc.go
index 8f3d36b66d6..570c1ac5990 100644
--- a/staging/src/k8s.io/apiserver/pkg/authentication/request/x509/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/authentication/request/x509/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package x509 provides a request authenticator that validates and
 // extracts user information from client certificates
-package x509 // import "k8s.io/apiserver/pkg/authentication/request/x509"
+package x509
diff --git a/staging/src/k8s.io/apiserver/pkg/authentication/user/doc.go b/staging/src/k8s.io/apiserver/pkg/authentication/user/doc.go
index 3d87fd72caf..570c51ae995 100644
--- a/staging/src/k8s.io/apiserver/pkg/authentication/user/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/authentication/user/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package user contains utilities for dealing with simple user exchange in the auth
 // packages. The user.Info interface defines an interface for exchanging that info.
-package user // import "k8s.io/apiserver/pkg/authentication/user"
+package user
diff --git a/staging/src/k8s.io/apiserver/pkg/authorization/path/doc.go b/staging/src/k8s.io/apiserver/pkg/authorization/path/doc.go
index 654aaeb7424..743d945b46b 100644
--- a/staging/src/k8s.io/apiserver/pkg/authorization/path/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/authorization/path/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package path contains an authorizer that allows certain paths and path prefixes.
-package path // import "k8s.io/apiserver/pkg/authorization/path"
+package path
diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/doc.go b/staging/src/k8s.io/apiserver/pkg/endpoints/doc.go
index ef99114b61e..f92c0e95f08 100644
--- a/staging/src/k8s.io/apiserver/pkg/endpoints/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/endpoints/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package endpoints contains the generic code that provides a RESTful Kubernetes-style API service.
-package endpoints // import "k8s.io/apiserver/pkg/endpoints"
+package endpoints
diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/filters/doc.go b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/doc.go
index a13125a25ac..5fb108039f8 100644
--- a/staging/src/k8s.io/apiserver/pkg/endpoints/filters/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // _are_ api related, i.e. which are prerequisite for the API services
 // to work (in contrast to the filters in the server package which are
 // not part of the API contract).
-package filters // import "k8s.io/apiserver/pkg/endpoints/filters"
+package filters
diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/doc.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/doc.go
index d39833814e4..2dc42ffab41 100644
--- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package handlers contains HTTP handlers to implement the apiserver APIs.
-package handlers // import "k8s.io/apiserver/pkg/endpoints/handlers"
+package handlers
diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/negotiation/doc.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/negotiation/doc.go
index 80f4feb7272..1490b28fe8e 100644
--- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/negotiation/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/negotiation/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package negotiation contains media type negotiation logic.
-package negotiation // import "k8s.io/apiserver/pkg/endpoints/handlers/negotiation"
+package negotiation
diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/responsewriters/doc.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/responsewriters/doc.go
index b76758b7932..96ec5507469 100644
--- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/responsewriters/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/responsewriters/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package responsewriters containers helpers to write responses in HTTP handlers.
-package responsewriters // import "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
+package responsewriters
diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/request/doc.go b/staging/src/k8s.io/apiserver/pkg/endpoints/request/doc.go
index 96da6f2b9cb..bf0ce958184 100644
--- a/staging/src/k8s.io/apiserver/pkg/endpoints/request/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/endpoints/request/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // Package request contains everything around extracting info from
 // a http request object.
 // TODO: this package is temporary. Handlers must move into pkg/apiserver/handlers to avoid dependency cycle
-package request // import "k8s.io/apiserver/pkg/endpoints/request"
+package request
diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/testing/doc.go b/staging/src/k8s.io/apiserver/pkg/endpoints/testing/doc.go
index 2e801ab5f5f..0ea50660981 100644
--- a/staging/src/k8s.io/apiserver/pkg/endpoints/testing/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/endpoints/testing/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package testing // import "k8s.io/apiserver/pkg/endpoints/testing"
+package testing
diff --git a/staging/src/k8s.io/apiserver/pkg/registry/doc.go b/staging/src/k8s.io/apiserver/pkg/registry/doc.go
index f41dc0a2d8a..48dc21b23e1 100644
--- a/staging/src/k8s.io/apiserver/pkg/registry/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/registry/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package registry contains the generic implementation of the storage and system logic.
-package registry // import "k8s.io/apiserver/pkg/registry"
+package registry
diff --git a/staging/src/k8s.io/apiserver/pkg/registry/generic/doc.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/doc.go
index ea79d130a79..47bb9530404 100644
--- a/staging/src/k8s.io/apiserver/pkg/registry/generic/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/registry/generic/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package generic provides a generic object store interface and a
 // generic label/field matching type.
-package generic // import "k8s.io/apiserver/pkg/registry/generic"
+package generic
diff --git a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/doc.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/doc.go
index bd315ae47bd..643a6fb7b65 100644
--- a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package etcd has a generic implementation of a registry that
 // stores things in etcd.
-package registry // import "k8s.io/apiserver/pkg/registry/generic/registry"
+package registry
diff --git a/staging/src/k8s.io/apiserver/pkg/registry/generic/rest/doc.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/rest/doc.go
index 3b77b559368..9696087fb23 100644
--- a/staging/src/k8s.io/apiserver/pkg/registry/generic/rest/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/registry/generic/rest/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package rest has generic implementations of resources used for
 // REST responses
-package rest // import "k8s.io/apiserver/pkg/registry/generic/rest"
+package rest
diff --git a/staging/src/k8s.io/apiserver/pkg/registry/rest/doc.go b/staging/src/k8s.io/apiserver/pkg/registry/rest/doc.go
index 20524d21ff0..951a6278e4e 100644
--- a/staging/src/k8s.io/apiserver/pkg/registry/rest/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/registry/rest/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package rest defines common logic around changes to Kubernetes-style resources.
-package rest // import "k8s.io/apiserver/pkg/registry/rest"
+package rest
diff --git a/staging/src/k8s.io/apiserver/pkg/server/doc.go b/staging/src/k8s.io/apiserver/pkg/server/doc.go
index bc671eae844..b5f97c65857 100644
--- a/staging/src/k8s.io/apiserver/pkg/server/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/server/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package server contains the plumbing to create kubernetes-like API server command.
-package server // import "k8s.io/apiserver/pkg/server"
+package server
diff --git a/staging/src/k8s.io/apiserver/pkg/server/filters/doc.go b/staging/src/k8s.io/apiserver/pkg/server/filters/doc.go
index a90cc3b4964..9fe0b2c35ac 100644
--- a/staging/src/k8s.io/apiserver/pkg/server/filters/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/server/filters/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package filters contains all the http handler chain filters which
 // are not api related.
-package filters // import "k8s.io/apiserver/pkg/server/filters"
+package filters
diff --git a/staging/src/k8s.io/apiserver/pkg/server/healthz/doc.go b/staging/src/k8s.io/apiserver/pkg/server/healthz/doc.go
index ad3f0018733..3881c0940a3 100644
--- a/staging/src/k8s.io/apiserver/pkg/server/healthz/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/server/healthz/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 //
 //	import "k8s.io/apiserver/pkg/server/healthz"
 //	healthz.InstallHandler(mux)
-package healthz // import "k8s.io/apiserver/pkg/server/healthz"
+package healthz
diff --git a/staging/src/k8s.io/apiserver/pkg/server/httplog/doc.go b/staging/src/k8s.io/apiserver/pkg/server/httplog/doc.go
index caa6572c761..57aa55ab91e 100644
--- a/staging/src/k8s.io/apiserver/pkg/server/httplog/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/server/httplog/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package httplog contains a helper object and functions to maintain a log
 // along with an http response.
-package httplog // import "k8s.io/apiserver/pkg/server/httplog"
+package httplog
diff --git a/staging/src/k8s.io/apiserver/pkg/server/mux/doc.go b/staging/src/k8s.io/apiserver/pkg/server/mux/doc.go
index 178aa9fe6c0..da9fb8ed7f5 100644
--- a/staging/src/k8s.io/apiserver/pkg/server/mux/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/server/mux/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package mux contains abstractions for http multiplexing of APIs.
-package mux // import "k8s.io/apiserver/pkg/server/mux"
+package mux
diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/doc.go b/staging/src/k8s.io/apiserver/pkg/server/options/doc.go
index 426336be09a..a7167a419e9 100644
--- a/staging/src/k8s.io/apiserver/pkg/server/options/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/server/options/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // server. It takes a minimal set of dependencies and does not reference
 // implementations, in order to ensure it may be reused by multiple components
 // (such as CLI commands that wish to generate or validate config).
-package options // import "k8s.io/apiserver/pkg/server/options"
+package options
diff --git a/staging/src/k8s.io/apiserver/pkg/server/resourceconfig/doc.go b/staging/src/k8s.io/apiserver/pkg/server/resourceconfig/doc.go
index 0dae21535dc..a6055414b9e 100644
--- a/staging/src/k8s.io/apiserver/pkg/server/resourceconfig/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/server/resourceconfig/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package resourceconfig contains the resource config related helper functions.
-package resourceconfig // import "k8s.io/apiserver/pkg/server/resourceconfig"
+package resourceconfig
diff --git a/staging/src/k8s.io/apiserver/pkg/server/routes/doc.go b/staging/src/k8s.io/apiserver/pkg/server/routes/doc.go
index 603e899cde4..adefbd3d559 100644
--- a/staging/src/k8s.io/apiserver/pkg/server/routes/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/server/routes/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package routes holds a collection of optional genericapiserver http handlers.
-package routes // import "k8s.io/apiserver/pkg/server/routes"
+package routes
diff --git a/staging/src/k8s.io/apiserver/pkg/server/storage/doc.go b/staging/src/k8s.io/apiserver/pkg/server/storage/doc.go
index 36b0d22524d..71d4e2be7d4 100644
--- a/staging/src/k8s.io/apiserver/pkg/server/storage/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/server/storage/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package storage contains the plumbing to setup the etcd storage of the apiserver.
-package storage // import "k8s.io/apiserver/pkg/server/storage"
+package storage
diff --git a/staging/src/k8s.io/apiserver/pkg/storage/doc.go b/staging/src/k8s.io/apiserver/pkg/storage/doc.go
index fbdd944687e..d2c5dbfc456 100644
--- a/staging/src/k8s.io/apiserver/pkg/storage/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/storage/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Interfaces for database-related operations.
-package storage // import "k8s.io/apiserver/pkg/storage"
+package storage
diff --git a/staging/src/k8s.io/apiserver/pkg/storage/errors/doc.go b/staging/src/k8s.io/apiserver/pkg/storage/errors/doc.go
index bbc65d389c2..e6347ba86d4 100644
--- a/staging/src/k8s.io/apiserver/pkg/storage/errors/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/storage/errors/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package storage provides conversion of storage errors to API errors.
-package errors // import "k8s.io/apiserver/pkg/storage/errors"
+package errors
diff --git a/staging/src/k8s.io/apiserver/pkg/storage/testresource/doc.go b/staging/src/k8s.io/apiserver/pkg/storage/testresource/doc.go
index de1aa04be66..0ecbb2f8c1b 100644
--- a/staging/src/k8s.io/apiserver/pkg/storage/testresource/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/storage/testresource/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package testresource // import "k8s.io/apiserver/pkg/storage/testresource"
+package testresource
diff --git a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/doc.go b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/doc.go
index 0cbe499cd06..fc30ebfd5bb 100644
--- a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/doc.go
@@ -116,4 +116,4 @@ limitations under the License.
 // queue’s virtual start time is advanced by G. When a request
 // finishes being served, and the actual service time was S, the
 // queue’s virtual start time is decremented by G - S.
-package queueset // import "k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset"
+package queueset
diff --git a/staging/src/k8s.io/apiserver/pkg/util/flushwriter/doc.go b/staging/src/k8s.io/apiserver/pkg/util/flushwriter/doc.go
index f81e09a29c5..1e7e324a154 100644
--- a/staging/src/k8s.io/apiserver/pkg/util/flushwriter/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/util/flushwriter/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package flushwriter implements a wrapper for a writer that flushes on every
 // write if that writer implements the io.Flusher interface
-package flushwriter // import "k8s.io/apiserver/pkg/util/flushwriter"
+package flushwriter
diff --git a/staging/src/k8s.io/apiserver/pkg/util/proxy/doc.go b/staging/src/k8s.io/apiserver/pkg/util/proxy/doc.go
index d24c9423caa..46f3775b720 100644
--- a/staging/src/k8s.io/apiserver/pkg/util/proxy/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/util/proxy/doc.go
@@ -33,4 +33,4 @@ limitations under the License.
 // the TunnelingConnection. A lot of the other code in streamtunnel.go
 // is for properly upgrading both the upstream SPDY connection and the
 // downstream WebSocket connection before streaming begins.
-package proxy // import "k8s.io/apiserver/pkg/util/proxy"
+package proxy
diff --git a/staging/src/k8s.io/apiserver/plugin/pkg/audit/buffered/doc.go b/staging/src/k8s.io/apiserver/plugin/pkg/audit/buffered/doc.go
index a82599e426c..933eacc8def 100644
--- a/staging/src/k8s.io/apiserver/plugin/pkg/audit/buffered/doc.go
+++ b/staging/src/k8s.io/apiserver/plugin/pkg/audit/buffered/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package buffered provides an implementation for the audit.Backend interface
 // that batches incoming audit events and sends batches to the delegate audit.Backend.
-package buffered // import "k8s.io/apiserver/plugin/pkg/audit/buffered"
+package buffered
diff --git a/staging/src/k8s.io/apiserver/plugin/pkg/audit/doc.go b/staging/src/k8s.io/apiserver/plugin/pkg/audit/doc.go
index f4fc2ed9db0..d88ca0e00fe 100644
--- a/staging/src/k8s.io/apiserver/plugin/pkg/audit/doc.go
+++ b/staging/src/k8s.io/apiserver/plugin/pkg/audit/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package audit contains implementations for pkg/audit/AuditBackend interface
-package audit // import "k8s.io/apiserver/plugin/pkg/audit"
+package audit
diff --git a/staging/src/k8s.io/apiserver/plugin/pkg/audit/fake/doc.go b/staging/src/k8s.io/apiserver/plugin/pkg/audit/fake/doc.go
index 27394761233..99d120c49f3 100644
--- a/staging/src/k8s.io/apiserver/plugin/pkg/audit/fake/doc.go
+++ b/staging/src/k8s.io/apiserver/plugin/pkg/audit/fake/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package fake provides a fake audit.Backend interface implementation for testing.
-package fake // import "k8s.io/apiserver/plugin/pkg/audit/fake"
+package fake
diff --git a/staging/src/k8s.io/apiserver/plugin/pkg/audit/truncate/doc.go b/staging/src/k8s.io/apiserver/plugin/pkg/audit/truncate/doc.go
index 9392ac31471..3157218eb14 100644
--- a/staging/src/k8s.io/apiserver/plugin/pkg/audit/truncate/doc.go
+++ b/staging/src/k8s.io/apiserver/plugin/pkg/audit/truncate/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package truncate provides an implementation for the audit.Backend interface
 // that truncates audit events and sends them to the delegate audit.Backend.
-package truncate // import "k8s.io/apiserver/plugin/pkg/audit/truncate"
+package truncate
diff --git a/staging/src/k8s.io/apiserver/plugin/pkg/authenticator/doc.go b/staging/src/k8s.io/apiserver/plugin/pkg/authenticator/doc.go
index e135bd61db6..91462008206 100644
--- a/staging/src/k8s.io/apiserver/plugin/pkg/authenticator/doc.go
+++ b/staging/src/k8s.io/apiserver/plugin/pkg/authenticator/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package authenticator contains implementations for pkg/auth/authenticator interfaces
-package authenticator // import "k8s.io/apiserver/plugin/pkg/authenticator"
+package authenticator
diff --git a/staging/src/k8s.io/cli-runtime/doc.go b/staging/src/k8s.io/cli-runtime/doc.go
index 9bf7ea0eebd..4cf25ccbf9c 100644
--- a/staging/src/k8s.io/cli-runtime/doc.go
+++ b/staging/src/k8s.io/cli-runtime/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package cliruntime // import "k8s.io/cli-runtime"
+package cliruntime
diff --git a/staging/src/k8s.io/cli-runtime/pkg/genericclioptions/doc.go b/staging/src/k8s.io/cli-runtime/pkg/genericclioptions/doc.go
index 303da330b7d..82c07839242 100644
--- a/staging/src/k8s.io/cli-runtime/pkg/genericclioptions/doc.go
+++ b/staging/src/k8s.io/cli-runtime/pkg/genericclioptions/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package genericclioptions contains flags which can be added to your command, bound, completed, and produce
 // useful helper functions.  Nothing in this package can depend on kube/kube
-package genericclioptions // import "k8s.io/cli-runtime/pkg/genericclioptions"
+package genericclioptions
diff --git a/staging/src/k8s.io/cli-runtime/pkg/printers/doc.go b/staging/src/k8s.io/cli-runtime/pkg/printers/doc.go
index ee205371de5..5f84f40b357 100644
--- a/staging/src/k8s.io/cli-runtime/pkg/printers/doc.go
+++ b/staging/src/k8s.io/cli-runtime/pkg/printers/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package printers is helper for formatting and printing runtime objects into
 // primitives io.writer.
-package printers // import "k8s.io/cli-runtime/pkg/printers"
+package printers
diff --git a/staging/src/k8s.io/cli-runtime/pkg/resource/doc.go b/staging/src/k8s.io/cli-runtime/pkg/resource/doc.go
index f83fdcbf8eb..a0e22e7cf78 100644
--- a/staging/src/k8s.io/cli-runtime/pkg/resource/doc.go
+++ b/staging/src/k8s.io/cli-runtime/pkg/resource/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 // standard command line arguments and parameters into a Visitor that can iterate
 // over all of the identified resources, whether on the server or on the local
 // filesystem.
-package resource // import "k8s.io/cli-runtime/pkg/resource"
+package resource
diff --git a/staging/src/k8s.io/client-go/applyconfigurations/doc.go b/staging/src/k8s.io/client-go/applyconfigurations/doc.go
index ac426c60754..8efc9523ed3 100644
--- a/staging/src/k8s.io/client-go/applyconfigurations/doc.go
+++ b/staging/src/k8s.io/client-go/applyconfigurations/doc.go
@@ -148,4 +148,4 @@ reconciliation code that performs a "read/modify-in-place/update" (or patch) wor
 	    // apply
 	    applied, err := deploymentClient.Apply(ctx, extractedDeployment, metav1.ApplyOptions{FieldManager: fieldMgr})
 */
-package applyconfigurations // import "k8s.io/client-go/applyconfigurations"
+package applyconfigurations
diff --git a/staging/src/k8s.io/client-go/discovery/doc.go b/staging/src/k8s.io/client-go/discovery/doc.go
index 6baa1ef2a51..76495588ef7 100644
--- a/staging/src/k8s.io/client-go/discovery/doc.go
+++ b/staging/src/k8s.io/client-go/discovery/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package discovery provides ways to discover server-supported
 // API groups, versions and resources.
-package discovery // import "k8s.io/client-go/discovery"
+package discovery
diff --git a/staging/src/k8s.io/client-go/doc.go b/staging/src/k8s.io/client-go/doc.go
index 2d69be7194b..d0f766a7ed5 100644
--- a/staging/src/k8s.io/client-go/doc.go
+++ b/staging/src/k8s.io/client-go/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package clientgo // import "k8s.io/client-go"
+package clientgo
diff --git a/staging/src/k8s.io/client-go/examples/fake-client/doc.go b/staging/src/k8s.io/client-go/examples/fake-client/doc.go
index 9379376ec99..1c02e5ea5e7 100644
--- a/staging/src/k8s.io/client-go/examples/fake-client/doc.go
+++ b/staging/src/k8s.io/client-go/examples/fake-client/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // Package fakeclient contains examples on how to use fakeclient in tests.
 // Note: This file is here to avoid warnings on go build since there are no
 // non-test files in this package.
-package fakeclient // import "k8s.io/client-go/examples/fake-client"
+package fakeclient
diff --git a/staging/src/k8s.io/client-go/informers/doc.go b/staging/src/k8s.io/client-go/informers/doc.go
index f37c3e4d015..231bffb69bd 100644
--- a/staging/src/k8s.io/client-go/informers/doc.go
+++ b/staging/src/k8s.io/client-go/informers/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package informers provides generated informers for Kubernetes APIs.
-package informers // import "k8s.io/client-go/informers"
+package informers
diff --git a/staging/src/k8s.io/client-go/kubernetes/doc.go b/staging/src/k8s.io/client-go/kubernetes/doc.go
index e052f81b852..9cef4242f2f 100644
--- a/staging/src/k8s.io/client-go/kubernetes/doc.go
+++ b/staging/src/k8s.io/client-go/kubernetes/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package kubernetes holds packages which implement a clientset for Kubernetes
 // APIs.
-package kubernetes // import "k8s.io/client-go/kubernetes"
+package kubernetes
diff --git a/staging/src/k8s.io/client-go/kubernetes/import.go b/staging/src/k8s.io/client-go/kubernetes/import.go
index c4f9a91bcfb..93f3e4c6e89 100644
--- a/staging/src/k8s.io/client-go/kubernetes/import.go
+++ b/staging/src/k8s.io/client-go/kubernetes/import.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // This file exists to enforce this clientset's vanity import path.
 
-package kubernetes // import "k8s.io/client-go/kubernetes"
+package kubernetes
diff --git a/staging/src/k8s.io/client-go/listers/doc.go b/staging/src/k8s.io/client-go/listers/doc.go
index 96c330c9311..da6a80408fd 100644
--- a/staging/src/k8s.io/client-go/listers/doc.go
+++ b/staging/src/k8s.io/client-go/listers/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package listers provides generated listers for Kubernetes APIs.
-package listers // import "k8s.io/client-go/listers"
+package listers
diff --git a/staging/src/k8s.io/client-go/pkg/apis/clientauthentication/doc.go b/staging/src/k8s.io/client-go/pkg/apis/clientauthentication/doc.go
index b99459757e5..486790fa69f 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/clientauthentication/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/clientauthentication/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +groupName=client.authentication.k8s.io
 
-package clientauthentication // import "k8s.io/client-go/pkg/apis/clientauthentication"
+package clientauthentication
diff --git a/staging/src/k8s.io/client-go/pkg/apis/clientauthentication/v1/doc.go b/staging/src/k8s.io/client-go/pkg/apis/clientauthentication/v1/doc.go
index 94ca35c2c91..e378b75cf69 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/clientauthentication/v1/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/clientauthentication/v1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=client.authentication.k8s.io
 
-package v1 // import "k8s.io/client-go/pkg/apis/clientauthentication/v1"
+package v1
diff --git a/staging/src/k8s.io/client-go/pkg/apis/clientauthentication/v1beta1/doc.go b/staging/src/k8s.io/client-go/pkg/apis/clientauthentication/v1beta1/doc.go
index 22d1c588bc7..6eb6a981574 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/clientauthentication/v1beta1/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/clientauthentication/v1beta1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 
 // +groupName=client.authentication.k8s.io
 
-package v1beta1 // import "k8s.io/client-go/pkg/apis/clientauthentication/v1beta1"
+package v1beta1
diff --git a/staging/src/k8s.io/client-go/pkg/version/doc.go b/staging/src/k8s.io/client-go/pkg/version/doc.go
index 05e997e1335..c3ace745136 100644
--- a/staging/src/k8s.io/client-go/pkg/version/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/version/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 
 // Package version supplies version information collected at build time to
 // kubernetes components.
-package version // import "k8s.io/client-go/pkg/version"
+package version
diff --git a/staging/src/k8s.io/client-go/scale/doc.go b/staging/src/k8s.io/client-go/scale/doc.go
index b6fa3f5f209..59fd39146ca 100644
--- a/staging/src/k8s.io/client-go/scale/doc.go
+++ b/staging/src/k8s.io/client-go/scale/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // and updating Scale for any resource which implements the `scale` subresource,
 // as long as that subresource operates on a version of scale convertable to
 // autoscaling.Scale.
-package scale // import "k8s.io/client-go/scale"
+package scale
diff --git a/staging/src/k8s.io/client-go/scale/scheme/appsint/doc.go b/staging/src/k8s.io/client-go/scale/scheme/appsint/doc.go
index 735efb953ce..16f29e2afee 100644
--- a/staging/src/k8s.io/client-go/scale/scheme/appsint/doc.go
+++ b/staging/src/k8s.io/client-go/scale/scheme/appsint/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 // It doesn't have any of its own types -- it's just necessary to
 // get the expected behavior out of runtime.Scheme.ConvertToVersion
 // and associated methods.
-package appsint // import "k8s.io/client-go/scale/scheme/appsint"
+package appsint
diff --git a/staging/src/k8s.io/client-go/scale/scheme/appsv1beta1/doc.go b/staging/src/k8s.io/client-go/scale/scheme/appsv1beta1/doc.go
index aea95e2e4cf..b9e8cf63d60 100644
--- a/staging/src/k8s.io/client-go/scale/scheme/appsv1beta1/doc.go
+++ b/staging/src/k8s.io/client-go/scale/scheme/appsv1beta1/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/client-go/scale/scheme
 // +k8s:conversion-gen-external-types=k8s.io/api/apps/v1beta1
 
-package appsv1beta1 // import "k8s.io/client-go/scale/scheme/appsv1beta1"
+package appsv1beta1
diff --git a/staging/src/k8s.io/client-go/scale/scheme/appsv1beta2/doc.go b/staging/src/k8s.io/client-go/scale/scheme/appsv1beta2/doc.go
index d1ae2118e94..b224c4da62d 100644
--- a/staging/src/k8s.io/client-go/scale/scheme/appsv1beta2/doc.go
+++ b/staging/src/k8s.io/client-go/scale/scheme/appsv1beta2/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/client-go/scale/scheme
 // +k8s:conversion-gen-external-types=k8s.io/api/apps/v1beta2
 
-package appsv1beta2 // import "k8s.io/client-go/scale/scheme/appsv1beta2"
+package appsv1beta2
diff --git a/staging/src/k8s.io/client-go/scale/scheme/autoscalingv1/doc.go b/staging/src/k8s.io/client-go/scale/scheme/autoscalingv1/doc.go
index 25f23d2d8c1..2741a8a457e 100644
--- a/staging/src/k8s.io/client-go/scale/scheme/autoscalingv1/doc.go
+++ b/staging/src/k8s.io/client-go/scale/scheme/autoscalingv1/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/client-go/scale/scheme
 // +k8s:conversion-gen-external-types=k8s.io/api/autoscaling/v1
 
-package autoscalingv1 // import "k8s.io/client-go/scale/scheme/autoscalingv1"
+package autoscalingv1
diff --git a/staging/src/k8s.io/client-go/scale/scheme/doc.go b/staging/src/k8s.io/client-go/scale/scheme/doc.go
index 248b448a59d..0203d6d5a27 100644
--- a/staging/src/k8s.io/client-go/scale/scheme/doc.go
+++ b/staging/src/k8s.io/client-go/scale/scheme/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 // Package scheme contains a runtime.Scheme to be used for serializing
 // and deserializing different versions of Scale, and for converting
 // in between them.
-package scheme // import "k8s.io/client-go/scale/scheme"
+package scheme
diff --git a/staging/src/k8s.io/client-go/scale/scheme/extensionsint/doc.go b/staging/src/k8s.io/client-go/scale/scheme/extensionsint/doc.go
index dedff2d7043..9aaac608617 100644
--- a/staging/src/k8s.io/client-go/scale/scheme/extensionsint/doc.go
+++ b/staging/src/k8s.io/client-go/scale/scheme/extensionsint/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 // It doesn't have any of its own types -- it's just necessary to
 // get the expected behavior out of runtime.Scheme.ConvertToVersion
 // and associated methods.
-package extensionsint // import "k8s.io/client-go/scale/scheme/extensionsint"
+package extensionsint
diff --git a/staging/src/k8s.io/client-go/scale/scheme/extensionsv1beta1/doc.go b/staging/src/k8s.io/client-go/scale/scheme/extensionsv1beta1/doc.go
index de633889a13..b5d24f50b7f 100644
--- a/staging/src/k8s.io/client-go/scale/scheme/extensionsv1beta1/doc.go
+++ b/staging/src/k8s.io/client-go/scale/scheme/extensionsv1beta1/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/client-go/scale/scheme
 // +k8s:conversion-gen-external-types=k8s.io/api/extensions/v1beta1
 
-package extensionsv1beta1 // import "k8s.io/client-go/scale/scheme/extensionsv1beta1"
+package extensionsv1beta1
diff --git a/staging/src/k8s.io/client-go/tools/cache/doc.go b/staging/src/k8s.io/client-go/tools/cache/doc.go
index 56b61d3006f..4f593f0d3d8 100644
--- a/staging/src/k8s.io/client-go/tools/cache/doc.go
+++ b/staging/src/k8s.io/client-go/tools/cache/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 // list currently available nodes), and one that additionally acts as
 // a FIFO queue (for example, to allow a scheduler to process incoming
 // pods).
-package cache // import "k8s.io/client-go/tools/cache"
+package cache
diff --git a/staging/src/k8s.io/client-go/tools/clientcmd/api/doc.go b/staging/src/k8s.io/client-go/tools/clientcmd/api/doc.go
index fd913a30832..5871575a669 100644
--- a/staging/src/k8s.io/client-go/tools/clientcmd/api/doc.go
+++ b/staging/src/k8s.io/client-go/tools/clientcmd/api/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package api // import "k8s.io/client-go/tools/clientcmd/api"
+package api
diff --git a/staging/src/k8s.io/client-go/tools/clientcmd/api/v1/doc.go b/staging/src/k8s.io/client-go/tools/clientcmd/api/v1/doc.go
index 9e483e9d75c..3ccdebc1c37 100644
--- a/staging/src/k8s.io/client-go/tools/clientcmd/api/v1/doc.go
+++ b/staging/src/k8s.io/client-go/tools/clientcmd/api/v1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +k8s:defaulter-gen=Kind
 
-package v1 // import "k8s.io/client-go/tools/clientcmd/api/v1"
+package v1
diff --git a/staging/src/k8s.io/client-go/tools/clientcmd/doc.go b/staging/src/k8s.io/client-go/tools/clientcmd/doc.go
index 424311ee12d..c07ace6a588 100644
--- a/staging/src/k8s.io/client-go/tools/clientcmd/doc.go
+++ b/staging/src/k8s.io/client-go/tools/clientcmd/doc.go
@@ -34,4 +34,4 @@ Sample usage from merged .kubeconfig files (local directory, home directory)
 	client, err := metav1.New(config)
 	// ...
 */
-package clientcmd // import "k8s.io/client-go/tools/clientcmd"
+package clientcmd
diff --git a/staging/src/k8s.io/client-go/tools/events/doc.go b/staging/src/k8s.io/client-go/tools/events/doc.go
index 8c48f607e13..08c0ba70bd2 100644
--- a/staging/src/k8s.io/client-go/tools/events/doc.go
+++ b/staging/src/k8s.io/client-go/tools/events/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package events has all client logic for recording and reporting
 // "k8s.io/api/events/v1".Event events.
-package events // import "k8s.io/client-go/tools/events"
+package events
diff --git a/staging/src/k8s.io/client-go/tools/portforward/doc.go b/staging/src/k8s.io/client-go/tools/portforward/doc.go
index 2f53406344f..e0f6cfbf2be 100644
--- a/staging/src/k8s.io/client-go/tools/portforward/doc.go
+++ b/staging/src/k8s.io/client-go/tools/portforward/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package portforward adds support for SSH-like port forwarding from the client's
 // local host to remote containers.
-package portforward // import "k8s.io/client-go/tools/portforward"
+package portforward
diff --git a/staging/src/k8s.io/client-go/tools/record/doc.go b/staging/src/k8s.io/client-go/tools/record/doc.go
index 33d5fe78ee0..23a35758c19 100644
--- a/staging/src/k8s.io/client-go/tools/record/doc.go
+++ b/staging/src/k8s.io/client-go/tools/record/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package record has all client logic for recording and reporting
 // "k8s.io/api/core/v1".Event events.
-package record // import "k8s.io/client-go/tools/record"
+package record
diff --git a/staging/src/k8s.io/client-go/tools/remotecommand/doc.go b/staging/src/k8s.io/client-go/tools/remotecommand/doc.go
index ac06a9cd376..b9f0db2d9ab 100644
--- a/staging/src/k8s.io/client-go/tools/remotecommand/doc.go
+++ b/staging/src/k8s.io/client-go/tools/remotecommand/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // Package remotecommand adds support for executing commands in containers,
 // with support for separate stdin, stdout, and stderr streams, as well as
 // TTY.
-package remotecommand // import "k8s.io/client-go/tools/remotecommand"
+package remotecommand
diff --git a/staging/src/k8s.io/client-go/util/jsonpath/doc.go b/staging/src/k8s.io/client-go/util/jsonpath/doc.go
index 0effb15c411..2a6e1706170 100644
--- a/staging/src/k8s.io/client-go/util/jsonpath/doc.go
+++ b/staging/src/k8s.io/client-go/util/jsonpath/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // package jsonpath is a template engine using jsonpath syntax,
 // which can be seen at http://goessner.net/articles/JsonPath/.
 // In addition, it has {range} {end} function to iterate list and slice.
-package jsonpath // import "k8s.io/client-go/util/jsonpath"
+package jsonpath
diff --git a/staging/src/k8s.io/client-go/util/workqueue/doc.go b/staging/src/k8s.io/client-go/util/workqueue/doc.go
index 8555aa95fe1..a76d830ede6 100644
--- a/staging/src/k8s.io/client-go/util/workqueue/doc.go
+++ b/staging/src/k8s.io/client-go/util/workqueue/doc.go
@@ -23,4 +23,4 @@ limitations under the License.
 //   - Multiple consumers and producers. In particular, it is allowed for an
 //     item to be reenqueued while it is being processed.
 //   - Shutdown notifications.
-package workqueue // import "k8s.io/client-go/util/workqueue"
+package workqueue
diff --git a/staging/src/k8s.io/cloud-provider/config/doc.go b/staging/src/k8s.io/cloud-provider/config/doc.go
index 73322994fab..25132693d7c 100644
--- a/staging/src/k8s.io/cloud-provider/config/doc.go
+++ b/staging/src/k8s.io/cloud-provider/config/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +groupName=cloudcontrollermanager.config.k8s.io
 
-package config // import "k8s.io/cloud-provider/config"
+package config
diff --git a/staging/src/k8s.io/cloud-provider/config/v1alpha1/doc.go b/staging/src/k8s.io/cloud-provider/config/v1alpha1/doc.go
index 91df9c15b18..4bce737d5ed 100644
--- a/staging/src/k8s.io/cloud-provider/config/v1alpha1/doc.go
+++ b/staging/src/k8s.io/cloud-provider/config/v1alpha1/doc.go
@@ -29,4 +29,4 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +groupName=cloudcontrollermanager.config.k8s.io
 
-package v1alpha1 // import "k8s.io/cloud-provider/config/v1alpha1"
+package v1alpha1
diff --git a/staging/src/k8s.io/cloud-provider/controllers/node/config/v1alpha1/doc.go b/staging/src/k8s.io/cloud-provider/controllers/node/config/v1alpha1/doc.go
index eff177166e8..05c1119a21b 100644
--- a/staging/src/k8s.io/cloud-provider/controllers/node/config/v1alpha1/doc.go
+++ b/staging/src/k8s.io/cloud-provider/controllers/node/config/v1alpha1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/cloud-provider/controllers/node/config
 // +k8s:conversion-gen=k8s.io/cloud-provider/controllers/node/config/v1alpha1
 
-package v1alpha1 // import "k8s.io/cloud-provider/controllers/node/config/v1alpha1"
+package v1alpha1
diff --git a/staging/src/k8s.io/cloud-provider/controllers/route/doc.go b/staging/src/k8s.io/cloud-provider/controllers/route/doc.go
index cdc16d81a7c..7208f5b4984 100644
--- a/staging/src/k8s.io/cloud-provider/controllers/route/doc.go
+++ b/staging/src/k8s.io/cloud-provider/controllers/route/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package route contains code for syncing cloud routing rules with
 // the list of registered nodes.
-package route // import "k8s.io/cloud-provider/controllers/route"
+package route
diff --git a/staging/src/k8s.io/cloud-provider/controllers/service/config/doc.go b/staging/src/k8s.io/cloud-provider/controllers/service/config/doc.go
index 4c3d3aae1e0..919c3093d7a 100644
--- a/staging/src/k8s.io/cloud-provider/controllers/service/config/doc.go
+++ b/staging/src/k8s.io/cloud-provider/controllers/service/config/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package config // import "k8s.io/cloud-provider/controllers/service/config"
+package config
diff --git a/staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1/doc.go b/staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1/doc.go
index 3d71af8aff8..7b9a0935177 100644
--- a/staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1/doc.go
+++ b/staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/cloud-provider/controllers/service/config
 // +k8s:conversion-gen=k8s.io/cloud-provider/controllers/service/config/v1alpha1
 
-package v1alpha1 // import "k8s.io/cloud-provider/controllers/service/config/v1alpha1"
+package v1alpha1
diff --git a/staging/src/k8s.io/cloud-provider/controllers/service/doc.go b/staging/src/k8s.io/cloud-provider/controllers/service/doc.go
index 252a23e5026..42b9d1f174f 100644
--- a/staging/src/k8s.io/cloud-provider/controllers/service/doc.go
+++ b/staging/src/k8s.io/cloud-provider/controllers/service/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package service contains code for syncing cloud load balancers
 // with the service registry.
-package service // import "k8s.io/cloud-provider/controllers/service"
+package service
diff --git a/staging/src/k8s.io/cloud-provider/doc.go b/staging/src/k8s.io/cloud-provider/doc.go
index 6b401e4564e..7192394c396 100644
--- a/staging/src/k8s.io/cloud-provider/doc.go
+++ b/staging/src/k8s.io/cloud-provider/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package cloudprovider supplies interfaces and implementations for cloud service providers.
-package cloudprovider // import "k8s.io/cloud-provider"
+package cloudprovider
diff --git a/staging/src/k8s.io/cloud-provider/fake/doc.go b/staging/src/k8s.io/cloud-provider/fake/doc.go
index c5761fe0d1f..caf5b1e52cd 100644
--- a/staging/src/k8s.io/cloud-provider/fake/doc.go
+++ b/staging/src/k8s.io/cloud-provider/fake/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package fake is a test-double implementation of cloudprovider
 // Interface, LoadBalancer and Instances. It is useful for testing.
-package fake // import "k8s.io/cloud-provider/fake"
+package fake
diff --git a/staging/src/k8s.io/cluster-bootstrap/doc.go b/staging/src/k8s.io/cluster-bootstrap/doc.go
index f7ed9686bea..3a2b132359f 100644
--- a/staging/src/k8s.io/cluster-bootstrap/doc.go
+++ b/staging/src/k8s.io/cluster-bootstrap/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package clusterbootstrap // import "k8s.io/cluster-bootstrap"
+package clusterbootstrap
diff --git a/staging/src/k8s.io/cluster-bootstrap/token/api/doc.go b/staging/src/k8s.io/cluster-bootstrap/token/api/doc.go
index 9bb5d9cdb04..c76ec9bbb38 100644
--- a/staging/src/k8s.io/cluster-bootstrap/token/api/doc.go
+++ b/staging/src/k8s.io/cluster-bootstrap/token/api/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // Package api (k8s.io/cluster-bootstrap/token/api) contains constants and types needed for
 // bootstrap tokens as maintained by the BootstrapSigner and TokenCleaner
 // controllers (in k8s.io/kubernetes/pkg/controller/bootstrap)
-package api // import "k8s.io/cluster-bootstrap/token/api"
+package api
diff --git a/staging/src/k8s.io/code-generator/cmd/defaulter-gen/output_tests/empty/doc.go b/staging/src/k8s.io/code-generator/cmd/defaulter-gen/output_tests/empty/doc.go
index 5dc6bba16f5..2b338eec936 100644
--- a/staging/src/k8s.io/code-generator/cmd/defaulter-gen/output_tests/empty/doc.go
+++ b/staging/src/k8s.io/code-generator/cmd/defaulter-gen/output_tests/empty/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:defaulter-gen=covers
 
 // This is a test package.
-package empty // import "k8s.io/code-generator/cmd/defaulter-gen/output_tests/empty"
+package empty
diff --git a/staging/src/k8s.io/code-generator/cmd/defaulter-gen/output_tests/marker/doc.go b/staging/src/k8s.io/code-generator/cmd/defaulter-gen/output_tests/marker/doc.go
index b99ba6a6df8..6db42e14e7c 100644
--- a/staging/src/k8s.io/code-generator/cmd/defaulter-gen/output_tests/marker/doc.go
+++ b/staging/src/k8s.io/code-generator/cmd/defaulter-gen/output_tests/marker/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 
 // This is a test package.
-package marker // import "k8s.io/code-generator/cmd/defaulter-gen/output_tests/marker"
+package marker
diff --git a/staging/src/k8s.io/code-generator/cmd/defaulter-gen/output_tests/pointer/doc.go b/staging/src/k8s.io/code-generator/cmd/defaulter-gen/output_tests/pointer/doc.go
index 0585a1b707b..4e2e7d7e0f8 100644
--- a/staging/src/k8s.io/code-generator/cmd/defaulter-gen/output_tests/pointer/doc.go
+++ b/staging/src/k8s.io/code-generator/cmd/defaulter-gen/output_tests/pointer/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 
 // This is a test package.
-package pointer // import "k8s.io/code-generator/cmd/defaulter-gen/output_tests/pointer"
+package pointer
diff --git a/staging/src/k8s.io/code-generator/cmd/defaulter-gen/output_tests/slices/doc.go b/staging/src/k8s.io/code-generator/cmd/defaulter-gen/output_tests/slices/doc.go
index c341905023a..39e61fb3903 100644
--- a/staging/src/k8s.io/code-generator/cmd/defaulter-gen/output_tests/slices/doc.go
+++ b/staging/src/k8s.io/code-generator/cmd/defaulter-gen/output_tests/slices/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 
 // This is a test package.
-package slices // import "k8s.io/code-generator/cmd/defaulter-gen/output_tests/slices"
+package slices
diff --git a/staging/src/k8s.io/code-generator/cmd/defaulter-gen/output_tests/wholepkg/doc.go b/staging/src/k8s.io/code-generator/cmd/defaulter-gen/output_tests/wholepkg/doc.go
index d9a62999717..7e9a651f35d 100644
--- a/staging/src/k8s.io/code-generator/cmd/defaulter-gen/output_tests/wholepkg/doc.go
+++ b/staging/src/k8s.io/code-generator/cmd/defaulter-gen/output_tests/wholepkg/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 
 // This is a test package.
-package wholepkg // import "k8s.io/code-generator/cmd/defaulter-gen/output_tests/wholepkg"
+package wholepkg
diff --git a/staging/src/k8s.io/code-generator/doc.go b/staging/src/k8s.io/code-generator/doc.go
index fd867306974..3ef48f7521e 100644
--- a/staging/src/k8s.io/code-generator/doc.go
+++ b/staging/src/k8s.io/code-generator/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package codegenerator // import "k8s.io/code-generator"
+package codegenerator
diff --git a/staging/src/k8s.io/code-generator/examples/HyphenGroup/apis/example/v1/doc.go b/staging/src/k8s.io/code-generator/examples/HyphenGroup/apis/example/v1/doc.go
index 9bf8515c534..aab826f9355 100644
--- a/staging/src/k8s.io/code-generator/examples/HyphenGroup/apis/example/v1/doc.go
+++ b/staging/src/k8s.io/code-generator/examples/HyphenGroup/apis/example/v1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +groupName=example-group.hyphens.code-generator.k8s.io
 // +groupGoName=ExampleGroup
-package v1 // import "k8s.io/code-generator/examples/HyphenGroup/apis/example/v1"
+package v1
diff --git a/staging/src/k8s.io/code-generator/examples/MixedCase/apis/example/v1/doc.go b/staging/src/k8s.io/code-generator/examples/MixedCase/apis/example/v1/doc.go
index 5012b4f63ba..e6614c0da66 100644
--- a/staging/src/k8s.io/code-generator/examples/MixedCase/apis/example/v1/doc.go
+++ b/staging/src/k8s.io/code-generator/examples/MixedCase/apis/example/v1/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +k8s:defaulter-gen=TypeMeta
 // +groupName=example.crd.code-generator.k8s.io
-package v1 // import "k8s.io/code-generator/examples/MixedCase/apis/example/v1"
+package v1
diff --git a/staging/src/k8s.io/code-generator/examples/apiserver/apis/core/doc.go b/staging/src/k8s.io/code-generator/examples/apiserver/apis/core/doc.go
index da76737808c..83004407592 100644
--- a/staging/src/k8s.io/code-generator/examples/apiserver/apis/core/doc.go
+++ b/staging/src/k8s.io/code-generator/examples/apiserver/apis/core/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +groupName=
 
-package core // import "k8s.io/code-generator/examples/apiserver/apis/core"
+package core
diff --git a/staging/src/k8s.io/code-generator/examples/apiserver/apis/core/v1/doc.go b/staging/src/k8s.io/code-generator/examples/apiserver/apis/core/v1/doc.go
index 0de0bdda64e..d59731bcf1c 100644
--- a/staging/src/k8s.io/code-generator/examples/apiserver/apis/core/v1/doc.go
+++ b/staging/src/k8s.io/code-generator/examples/apiserver/apis/core/v1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/code-generator/examples/apiserver/apis/core
 // +groupName=
 
-package v1 // import "k8s.io/code-generator/examples/apiserver/apis/core/v1"
+package v1
diff --git a/staging/src/k8s.io/code-generator/examples/apiserver/apis/example/doc.go b/staging/src/k8s.io/code-generator/examples/apiserver/apis/example/doc.go
index 97d06e6903e..c46cee4a03e 100644
--- a/staging/src/k8s.io/code-generator/examples/apiserver/apis/example/doc.go
+++ b/staging/src/k8s.io/code-generator/examples/apiserver/apis/example/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +groupName=example.apiserver.code-generator.k8s.io
 
-package example // import "k8s.io/code-generator/examples/apiserver/apis/example"
+package example
diff --git a/staging/src/k8s.io/code-generator/examples/apiserver/apis/example/v1/doc.go b/staging/src/k8s.io/code-generator/examples/apiserver/apis/example/v1/doc.go
index 9de47d16033..9e4436f5c46 100644
--- a/staging/src/k8s.io/code-generator/examples/apiserver/apis/example/v1/doc.go
+++ b/staging/src/k8s.io/code-generator/examples/apiserver/apis/example/v1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/code-generator/examples/apiserver/apis/example
 // +groupName=example.apiserver.code-generator.k8s.io
 
-package v1 // import "k8s.io/code-generator/examples/apiserver/apis/example/v1"
+package v1
diff --git a/staging/src/k8s.io/code-generator/examples/apiserver/apis/example2/doc.go b/staging/src/k8s.io/code-generator/examples/apiserver/apis/example2/doc.go
index c4a408eacfa..09be515b579 100644
--- a/staging/src/k8s.io/code-generator/examples/apiserver/apis/example2/doc.go
+++ b/staging/src/k8s.io/code-generator/examples/apiserver/apis/example2/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +groupName=example.test.apiserver.code-generator.k8s.io
 // +groupGoName=SecondExample
 
-package example2 // import "k8s.io/code-generator/examples/apiserver/apis/example2"
+package example2
diff --git a/staging/src/k8s.io/code-generator/examples/apiserver/apis/example2/v1/doc.go b/staging/src/k8s.io/code-generator/examples/apiserver/apis/example2/v1/doc.go
index b46b07f1d0f..42353ffd045 100644
--- a/staging/src/k8s.io/code-generator/examples/apiserver/apis/example2/v1/doc.go
+++ b/staging/src/k8s.io/code-generator/examples/apiserver/apis/example2/v1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/code-generator/examples/apiserver/apis/example2
 // +groupGoName=SecondExample
 
-package v1 // import "k8s.io/code-generator/examples/apiserver/apis/example2/v1"
+package v1
diff --git a/staging/src/k8s.io/code-generator/examples/apiserver/apis/example3.io/doc.go b/staging/src/k8s.io/code-generator/examples/apiserver/apis/example3.io/doc.go
index f1779abe41d..89ee87604e2 100644
--- a/staging/src/k8s.io/code-generator/examples/apiserver/apis/example3.io/doc.go
+++ b/staging/src/k8s.io/code-generator/examples/apiserver/apis/example3.io/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +groupName=example.dots.apiserver.code-generator.k8s.io
 // +groupGoName=ThirdExample
 
-package example3 // import "k8s.io/code-generator/examples/apiserver/apis/example3.io"
+package example3
diff --git a/staging/src/k8s.io/code-generator/examples/apiserver/apis/example3.io/v1/doc.go b/staging/src/k8s.io/code-generator/examples/apiserver/apis/example3.io/v1/doc.go
index f6aa7bdc0d4..cd598d47ad1 100644
--- a/staging/src/k8s.io/code-generator/examples/apiserver/apis/example3.io/v1/doc.go
+++ b/staging/src/k8s.io/code-generator/examples/apiserver/apis/example3.io/v1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/code-generator/examples/apiserver/apis/example3.io
 // +groupGoName=ThirdExample
 
-package v1 // import "k8s.io/code-generator/examples/apiserver/apis/example3.io/v1"
+package v1
diff --git a/staging/src/k8s.io/code-generator/examples/crd/apis/conflicting/v1/doc.go b/staging/src/k8s.io/code-generator/examples/crd/apis/conflicting/v1/doc.go
index 3fa9b9461f8..76620d2ef53 100644
--- a/staging/src/k8s.io/code-generator/examples/crd/apis/conflicting/v1/doc.go
+++ b/staging/src/k8s.io/code-generator/examples/crd/apis/conflicting/v1/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 // +groupName=conflicting.test.crd.code-generator.k8s.io
 // +groupGoName=ConflictingExample
 
-package v1 // import "k8s.io/code-generator/examples/crd/apis/conflicting/v1"
+package v1
diff --git a/staging/src/k8s.io/code-generator/examples/crd/apis/example/v1/doc.go b/staging/src/k8s.io/code-generator/examples/crd/apis/example/v1/doc.go
index 89647413b0c..673ac55d7b4 100644
--- a/staging/src/k8s.io/code-generator/examples/crd/apis/example/v1/doc.go
+++ b/staging/src/k8s.io/code-generator/examples/crd/apis/example/v1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +groupName=example.crd.code-generator.k8s.io
 
-package v1 // import "k8s.io/code-generator/examples/crd/apis/example/v1"
+package v1
diff --git a/staging/src/k8s.io/code-generator/examples/crd/apis/example2/v1/doc.go b/staging/src/k8s.io/code-generator/examples/crd/apis/example2/v1/doc.go
index 0f962c8b19f..5d1cbec5efb 100644
--- a/staging/src/k8s.io/code-generator/examples/crd/apis/example2/v1/doc.go
+++ b/staging/src/k8s.io/code-generator/examples/crd/apis/example2/v1/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 // +groupName=example.test.crd.code-generator.k8s.io
 // +groupGoName=SecondExample
 
-package v1 // import "k8s.io/code-generator/examples/crd/apis/example2/v1"
+package v1
diff --git a/staging/src/k8s.io/code-generator/examples/crd/apis/extensions/v1/doc.go b/staging/src/k8s.io/code-generator/examples/crd/apis/extensions/v1/doc.go
index 0c7a9100f33..a90928266bc 100644
--- a/staging/src/k8s.io/code-generator/examples/crd/apis/extensions/v1/doc.go
+++ b/staging/src/k8s.io/code-generator/examples/crd/apis/extensions/v1/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 // +groupName=extensions.test.crd.code-generator.k8s.io
 // +groupGoName=ExtensionsExample
 
-package v1 // import "k8s.io/code-generator/examples/crd/apis/extensions/v1"
+package v1
diff --git a/staging/src/k8s.io/code-generator/examples/single/api/v1/doc.go b/staging/src/k8s.io/code-generator/examples/single/api/v1/doc.go
index 89647413b0c..673ac55d7b4 100644
--- a/staging/src/k8s.io/code-generator/examples/single/api/v1/doc.go
+++ b/staging/src/k8s.io/code-generator/examples/single/api/v1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +groupName=example.crd.code-generator.k8s.io
 
-package v1 // import "k8s.io/code-generator/examples/crd/apis/example/v1"
+package v1
diff --git a/staging/src/k8s.io/component-base/config/doc.go b/staging/src/k8s.io/component-base/config/doc.go
index dd0a5a53a7b..a06a258eb3f 100644
--- a/staging/src/k8s.io/component-base/config/doc.go
+++ b/staging/src/k8s.io/component-base/config/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package config // import "k8s.io/component-base/config"
+package config
diff --git a/staging/src/k8s.io/component-base/config/v1alpha1/doc.go b/staging/src/k8s.io/component-base/config/v1alpha1/doc.go
index 3cd4f4292e5..7e4d6e8904e 100644
--- a/staging/src/k8s.io/component-base/config/v1alpha1/doc.go
+++ b/staging/src/k8s.io/component-base/config/v1alpha1/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +k8s:conversion-gen=k8s.io/component-base/config
 
-package v1alpha1 // import "k8s.io/component-base/config/v1alpha1"
+package v1alpha1
diff --git a/staging/src/k8s.io/component-base/doc.go b/staging/src/k8s.io/component-base/doc.go
index 7ee34e9dae5..52f2ef5ad9c 100644
--- a/staging/src/k8s.io/component-base/doc.go
+++ b/staging/src/k8s.io/component-base/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package componentbase // import "k8s.io/component-base"
+package componentbase
diff --git a/staging/src/k8s.io/component-base/logs/api/v1/doc.go b/staging/src/k8s.io/component-base/logs/api/v1/doc.go
index 735aecb0c2e..dee5335fa8e 100644
--- a/staging/src/k8s.io/component-base/logs/api/v1/doc.go
+++ b/staging/src/k8s.io/component-base/logs/api/v1/doc.go
@@ -29,4 +29,4 @@ limitations under the License.
 // The LoggingAlphaOptions and LoggingBetaOptions feature gates control whether
 // these unstable features can get enabled. This can be used to ensure that
 // command invocations do not accidentally rely on unstable features.
-package v1 // import "k8s.io/component-base/logs/api/v1"
+package v1
diff --git a/staging/src/k8s.io/component-base/tracing/api/v1/doc.go b/staging/src/k8s.io/component-base/tracing/api/v1/doc.go
index ffe36aef6f0..48e6e20f3f0 100644
--- a/staging/src/k8s.io/component-base/tracing/api/v1/doc.go
+++ b/staging/src/k8s.io/component-base/tracing/api/v1/doc.go
@@ -26,4 +26,4 @@ limitations under the License.
 // The "v1" package name is just a reminder that API compatibility rules apply,
 // not an indication of the stability of all features covered by it.
 
-package v1 // import "k8s.io/component-base/tracing/api/v1"
+package v1
diff --git a/staging/src/k8s.io/component-helpers/doc.go b/staging/src/k8s.io/component-helpers/doc.go
index fa7a3ee24de..def7d875bf6 100644
--- a/staging/src/k8s.io/component-helpers/doc.go
+++ b/staging/src/k8s.io/component-helpers/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package componenthelpers // import "k8s.io/component-helpers"
+package componenthelpers
diff --git a/staging/src/k8s.io/component-helpers/scheduling/corev1/doc.go b/staging/src/k8s.io/component-helpers/scheduling/corev1/doc.go
index c6cf8132afb..98c82aaddbe 100644
--- a/staging/src/k8s.io/component-helpers/scheduling/corev1/doc.go
+++ b/staging/src/k8s.io/component-helpers/scheduling/corev1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // - Be used by a core component and another kubernetes project (cluster-autoscaler, descheduler)
 //
 // And be a scheduling feature.
-package corev1 // import "k8s.io/component-helpers/scheduling/corev1"
+package corev1
diff --git a/staging/src/k8s.io/controller-manager/config/doc.go b/staging/src/k8s.io/controller-manager/config/doc.go
index a98a0c8cd8d..164ec715bb4 100644
--- a/staging/src/k8s.io/controller-manager/config/doc.go
+++ b/staging/src/k8s.io/controller-manager/config/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package config // import "k8s.io/controller-manager/config"
+package config
diff --git a/staging/src/k8s.io/controller-manager/config/v1/doc.go b/staging/src/k8s.io/controller-manager/config/v1/doc.go
index 037cfb78563..2062f49b68e 100644
--- a/staging/src/k8s.io/controller-manager/config/v1/doc.go
+++ b/staging/src/k8s.io/controller-manager/config/v1/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +groupName=controllermanager.config.k8s.io
 
-package v1 // import "k8s.io/controller-manager/config/v1"
+package v1
diff --git a/staging/src/k8s.io/controller-manager/config/v1alpha1/doc.go b/staging/src/k8s.io/controller-manager/config/v1alpha1/doc.go
index b01cf385ddd..72d1f3cf6b0 100644
--- a/staging/src/k8s.io/controller-manager/config/v1alpha1/doc.go
+++ b/staging/src/k8s.io/controller-manager/config/v1alpha1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:openapi-gen=true
 // +groupName=controllermanager.config.k8s.io
 
-package v1alpha1 // import "k8s.io/controller-manager/config/v1alpha1"
+package v1alpha1
diff --git a/staging/src/k8s.io/controller-manager/config/v1beta1/doc.go b/staging/src/k8s.io/controller-manager/config/v1beta1/doc.go
index 94cd3f12831..0af8864a881 100644
--- a/staging/src/k8s.io/controller-manager/config/v1beta1/doc.go
+++ b/staging/src/k8s.io/controller-manager/config/v1beta1/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 // +k8s:openapi-gen=true
 // +groupName=controllermanager.config.k8s.io
 
-package v1beta1 // import "k8s.io/controller-manager/config/v1beta1"
+package v1beta1
diff --git a/staging/src/k8s.io/controller-manager/doc.go b/staging/src/k8s.io/controller-manager/doc.go
index afdca1cc29e..64ef6a865b2 100644
--- a/staging/src/k8s.io/controller-manager/doc.go
+++ b/staging/src/k8s.io/controller-manager/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // Package controllermanager contains the common library code for
 // building a controller-manager. It was based on the common code
 // between the kube-controller-manager and the cloud-controller-manager.
-package controllermanager // import "k8s.io/controller-manager"
+package controllermanager
diff --git a/staging/src/k8s.io/cri-api/doc.go b/staging/src/k8s.io/cri-api/doc.go
index c74e04a34be..0a925ff2e7e 100644
--- a/staging/src/k8s.io/cri-api/doc.go
+++ b/staging/src/k8s.io/cri-api/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package criapi // import "k8s.io/cri-api"
+package criapi
diff --git a/staging/src/k8s.io/cri-api/pkg/errors/doc.go b/staging/src/k8s.io/cri-api/pkg/errors/doc.go
index f3413ee9804..c7a7bec6064 100644
--- a/staging/src/k8s.io/cri-api/pkg/errors/doc.go
+++ b/staging/src/k8s.io/cri-api/pkg/errors/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package errors provides helper functions for use by the kubelet
 // to deal with CRI errors.
-package errors // import "k8s.io/cri-api/pkg/errors"
+package errors
diff --git a/staging/src/k8s.io/dynamic-resource-allocation/doc.go b/staging/src/k8s.io/dynamic-resource-allocation/doc.go
index 0578424ad86..c0e4fa4d43f 100644
--- a/staging/src/k8s.io/dynamic-resource-allocation/doc.go
+++ b/staging/src/k8s.io/dynamic-resource-allocation/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package dynamicresourceallocation contains helper packages for the dynamic
 // resource allocation feature.
-package dynamicresourceallocation // import "k8s.io/dynamic-resource-allocation"
+package dynamicresourceallocation
diff --git a/staging/src/k8s.io/dynamic-resource-allocation/kubeletplugin/doc.go b/staging/src/k8s.io/dynamic-resource-allocation/kubeletplugin/doc.go
index c9a605bd4c2..cdc33100a3f 100644
--- a/staging/src/k8s.io/dynamic-resource-allocation/kubeletplugin/doc.go
+++ b/staging/src/k8s.io/dynamic-resource-allocation/kubeletplugin/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package kubeletplugin provides helper functions for running a dynamic
 // resource allocation kubelet plugin.
-package kubeletplugin // import "k8s.io/dynamic-resource-allocation/kubeletplugin"
+package kubeletplugin
diff --git a/staging/src/k8s.io/endpointslice/doc.go b/staging/src/k8s.io/endpointslice/doc.go
index 5a782864c67..2bed6cfa987 100644
--- a/staging/src/k8s.io/endpointslice/doc.go
+++ b/staging/src/k8s.io/endpointslice/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package endpointslice contains the core logic of endpointslice controller.
-package endpointslice // import "k8s.io/endpointslice"
+package endpointslice
diff --git a/staging/src/k8s.io/externaljwt/docs.go b/staging/src/k8s.io/externaljwt/docs.go
index f19d6978b3d..9d4a31c9909 100644
--- a/staging/src/k8s.io/externaljwt/docs.go
+++ b/staging/src/k8s.io/externaljwt/docs.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package externaljwt contains the proto definitions for the ExternalJWTSigner.
-package externaljwt // import "k8s.io/externaljwt"
+package externaljwt
diff --git a/staging/src/k8s.io/kms/doc.go b/staging/src/k8s.io/kms/doc.go
index 1b08863876a..1d547f8fcbd 100644
--- a/staging/src/k8s.io/kms/doc.go
+++ b/staging/src/k8s.io/kms/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package kms contains the proto definitions for the kms API.
-package kms // import "k8s.io/kms"
+package kms
diff --git a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/doc.go b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/doc.go
index 394bcbc8ef8..e1a1ab796dc 100644
--- a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/doc.go
+++ b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +groupName=apiregistration.k8s.io
 
 // Package apiregistration is the internal version of the API.
-package apiregistration // import "k8s.io/kube-aggregator/pkg/apis/apiregistration"
+package apiregistration
diff --git a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/doc.go b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/doc.go
index dd286e1f215..d3dfe0689e0 100644
--- a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/doc.go
+++ b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/doc.go
@@ -35,4 +35,4 @@ limitations under the License.
 // The return status is a set of conditions for this aggregation. Currently
 // there is only one condition named "Available", if true, it means the
 // api/server requests will be redirected to specified API server.
-package v1 // import "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
+package v1
diff --git a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/doc.go b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/doc.go
index 2d5a6e44e9b..40d1131ca08 100644
--- a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/doc.go
+++ b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/doc.go
@@ -35,4 +35,4 @@ limitations under the License.
 // The return status is a set of conditions for this aggregation. Currently
 // there is only one condition named "Available", if true, it means the
 // api/server requests will be redirected to specified API server.
-package v1beta1 // import "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1"
+package v1beta1
diff --git a/staging/src/k8s.io/kube-controller-manager/config/v1alpha1/doc.go b/staging/src/k8s.io/kube-controller-manager/config/v1alpha1/doc.go
index 1631186e50f..9017efebb1a 100644
--- a/staging/src/k8s.io/kube-controller-manager/config/v1alpha1/doc.go
+++ b/staging/src/k8s.io/kube-controller-manager/config/v1alpha1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:openapi-gen=true
 // +groupName=kubecontrollermanager.config.k8s.io
 
-package v1alpha1 // import "k8s.io/kube-controller-manager/config/v1alpha1"
+package v1alpha1
diff --git a/staging/src/k8s.io/kube-controller-manager/doc.go b/staging/src/k8s.io/kube-controller-manager/doc.go
index 872ff13c645..bb493daed8d 100644
--- a/staging/src/k8s.io/kube-controller-manager/doc.go
+++ b/staging/src/k8s.io/kube-controller-manager/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package kubecontrollermanager // import "k8s.io/kube-controller-manager"
+package kubecontrollermanager
diff --git a/staging/src/k8s.io/kube-proxy/config/v1alpha1/doc.go b/staging/src/k8s.io/kube-proxy/config/v1alpha1/doc.go
index cb62b1cc134..5937b74cf0e 100644
--- a/staging/src/k8s.io/kube-proxy/config/v1alpha1/doc.go
+++ b/staging/src/k8s.io/kube-proxy/config/v1alpha1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:openapi-gen=true
 // +groupName=kubeproxy.config.k8s.io
 
-package v1alpha1 // import "k8s.io/kube-proxy/config/v1alpha1"
+package v1alpha1
diff --git a/staging/src/k8s.io/kube-proxy/doc.go b/staging/src/k8s.io/kube-proxy/doc.go
index 85975687e46..cab4dc28889 100644
--- a/staging/src/k8s.io/kube-proxy/doc.go
+++ b/staging/src/k8s.io/kube-proxy/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package kubeproxy // import "k8s.io/kube-proxy"
+package kubeproxy
diff --git a/staging/src/k8s.io/kube-scheduler/config/v1/doc.go b/staging/src/k8s.io/kube-scheduler/config/v1/doc.go
index bbc4641e72c..2d0e79e132f 100644
--- a/staging/src/k8s.io/kube-scheduler/config/v1/doc.go
+++ b/staging/src/k8s.io/kube-scheduler/config/v1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:openapi-gen=true
 // +groupName=kubescheduler.config.k8s.io
 
-package v1 // import "k8s.io/kube-scheduler/config/v1"
+package v1
diff --git a/staging/src/k8s.io/kube-scheduler/doc.go b/staging/src/k8s.io/kube-scheduler/doc.go
index b549e979eb6..64d836789c0 100644
--- a/staging/src/k8s.io/kube-scheduler/doc.go
+++ b/staging/src/k8s.io/kube-scheduler/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package kubescheduler // import "k8s.io/kube-scheduler"
+package kubescheduler
diff --git a/staging/src/k8s.io/kube-scheduler/extender/v1/doc.go b/staging/src/k8s.io/kube-scheduler/extender/v1/doc.go
index 202572083ac..4b311d4b734 100644
--- a/staging/src/k8s.io/kube-scheduler/extender/v1/doc.go
+++ b/staging/src/k8s.io/kube-scheduler/extender/v1/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 
 // Package v1 contains scheduler API objects.
-package v1 // import "k8s.io/kube-scheduler/extender/v1"
+package v1
diff --git a/staging/src/k8s.io/kubectl/doc.go b/staging/src/k8s.io/kubectl/doc.go
index c6983d686a6..d487cb7241a 100644
--- a/staging/src/k8s.io/kubectl/doc.go
+++ b/staging/src/k8s.io/kubectl/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package kubectl // import "k8s.io/kubectl"
+package kubectl
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/env/doc.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/env/doc.go
index f070ceb80e1..25e4c04a70f 100644
--- a/staging/src/k8s.io/kubectl/pkg/cmd/set/env/doc.go
+++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/env/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package env provides functions to incorporate environment variables into set env.
-package env // import "k8s.io/kubectl/pkg/cmd/set/env"
+package env
diff --git a/staging/src/k8s.io/kubectl/pkg/util/openapi/doc.go b/staging/src/k8s.io/kubectl/pkg/util/openapi/doc.go
index 7d3bc612436..56b393a1eb2 100644
--- a/staging/src/k8s.io/kubectl/pkg/util/openapi/doc.go
+++ b/staging/src/k8s.io/kubectl/pkg/util/openapi/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // from a Kubernetes server and then indexing the type definitions.
 // The openapi spec contains the object model definitions and extensions metadata
 // such as the patchStrategy and patchMergeKey for creating patches.
-package openapi // import "k8s.io/kubectl/pkg/util/openapi"
+package openapi
diff --git a/staging/src/k8s.io/kubelet/config/v1/doc.go b/staging/src/k8s.io/kubelet/config/v1/doc.go
index b411f7151b7..2c2ec7aa3d3 100644
--- a/staging/src/k8s.io/kubelet/config/v1/doc.go
+++ b/staging/src/k8s.io/kubelet/config/v1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:openapi-gen=true
 // +groupName=kubelet.config.k8s.io
 
-package v1 // import "k8s.io/kubelet/config/v1"
+package v1
diff --git a/staging/src/k8s.io/kubelet/config/v1alpha1/doc.go b/staging/src/k8s.io/kubelet/config/v1alpha1/doc.go
index 0c2d9f1a247..165efbb23c6 100644
--- a/staging/src/k8s.io/kubelet/config/v1alpha1/doc.go
+++ b/staging/src/k8s.io/kubelet/config/v1alpha1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:openapi-gen=true
 // +groupName=kubelet.config.k8s.io
 
-package v1alpha1 // import "k8s.io/kubelet/config/v1alpha1"
+package v1alpha1
diff --git a/staging/src/k8s.io/kubelet/config/v1beta1/doc.go b/staging/src/k8s.io/kubelet/config/v1beta1/doc.go
index 5644377d6c8..0edffa4b691 100644
--- a/staging/src/k8s.io/kubelet/config/v1beta1/doc.go
+++ b/staging/src/k8s.io/kubelet/config/v1beta1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:openapi-gen=true
 // +groupName=kubelet.config.k8s.io
 
-package v1beta1 // import "k8s.io/kubelet/config/v1beta1"
+package v1beta1
diff --git a/staging/src/k8s.io/kubelet/doc.go b/staging/src/k8s.io/kubelet/doc.go
index c28502e873f..012f40277ac 100644
--- a/staging/src/k8s.io/kubelet/doc.go
+++ b/staging/src/k8s.io/kubelet/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package kubelet // import "k8s.io/kubelet"
+package kubelet
diff --git a/staging/src/k8s.io/kubelet/pkg/apis/credentialprovider/doc.go b/staging/src/k8s.io/kubelet/pkg/apis/credentialprovider/doc.go
index 181583089c8..7f90183fa49 100644
--- a/staging/src/k8s.io/kubelet/pkg/apis/credentialprovider/doc.go
+++ b/staging/src/k8s.io/kubelet/pkg/apis/credentialprovider/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +groupName=credentialprovider.kubelet.k8s.io
 
-package credentialprovider // import "k8s.io/kubelet/pkg/apis/credentialprovider"
+package credentialprovider
diff --git a/staging/src/k8s.io/kubelet/pkg/apis/credentialprovider/v1/doc.go b/staging/src/k8s.io/kubelet/pkg/apis/credentialprovider/v1/doc.go
index 474a085ab92..871ccc86f68 100644
--- a/staging/src/k8s.io/kubelet/pkg/apis/credentialprovider/v1/doc.go
+++ b/staging/src/k8s.io/kubelet/pkg/apis/credentialprovider/v1/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +groupName=credentialprovider.kubelet.k8s.io
 
-package v1 // import "k8s.io/kubelet/pkg/apis/credentialprovider/v1"
+package v1
diff --git a/staging/src/k8s.io/kubelet/pkg/apis/credentialprovider/v1alpha1/doc.go b/staging/src/k8s.io/kubelet/pkg/apis/credentialprovider/v1alpha1/doc.go
index 6c0f42a0d70..9b3a5bcd49d 100644
--- a/staging/src/k8s.io/kubelet/pkg/apis/credentialprovider/v1alpha1/doc.go
+++ b/staging/src/k8s.io/kubelet/pkg/apis/credentialprovider/v1alpha1/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +groupName=credentialprovider.kubelet.k8s.io
 
-package v1alpha1 // import "k8s.io/kubelet/pkg/apis/credentialprovider/v1alpha1"
+package v1alpha1
diff --git a/staging/src/k8s.io/kubelet/pkg/apis/credentialprovider/v1beta1/doc.go b/staging/src/k8s.io/kubelet/pkg/apis/credentialprovider/v1beta1/doc.go
index df4f4bf150d..1c4c355257a 100644
--- a/staging/src/k8s.io/kubelet/pkg/apis/credentialprovider/v1beta1/doc.go
+++ b/staging/src/k8s.io/kubelet/pkg/apis/credentialprovider/v1beta1/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +groupName=credentialprovider.kubelet.k8s.io
 
-package v1beta1 // import "k8s.io/kubelet/pkg/apis/credentialprovider/v1beta1"
+package v1beta1
diff --git a/staging/src/k8s.io/kubelet/pkg/cri/streaming/remotecommand/doc.go b/staging/src/k8s.io/kubelet/pkg/cri/streaming/remotecommand/doc.go
index c3b6a6ba3f0..bf0d010b91e 100644
--- a/staging/src/k8s.io/kubelet/pkg/cri/streaming/remotecommand/doc.go
+++ b/staging/src/k8s.io/kubelet/pkg/cri/streaming/remotecommand/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package remotecommand contains functions related to executing commands in and attaching to pods.
-package remotecommand // import "k8s.io/kubelet/pkg/cri/streaming/remotecommand"
+package remotecommand
diff --git a/staging/src/k8s.io/metrics/doc.go b/staging/src/k8s.io/metrics/doc.go
index 3e5588c70d2..17911b6bc6c 100644
--- a/staging/src/k8s.io/metrics/doc.go
+++ b/staging/src/k8s.io/metrics/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package metrics // import "k8s.io/metrics"
+package metrics
diff --git a/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/doc.go b/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/doc.go
index 4ab9acbefc1..47f55f39e6e 100644
--- a/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/doc.go
+++ b/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +groupName=custom.metrics.k8s.io
 
 // Package custom_metrics defines an API for using custom metrics.
-package custom_metrics // import "k8s.io/metrics/pkg/apis/custom_metrics"
+package custom_metrics
diff --git a/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta1/doc.go b/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta1/doc.go
index 101365b262a..b42d1c7dfba 100644
--- a/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta1/doc.go
+++ b/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:openapi-gen=true
 
 // Package v1beta1 is the v1beta1 version of the custom_metrics API.
-package v1beta1 // import "k8s.io/metrics/pkg/apis/custom_metrics/v1beta1"
+package v1beta1
diff --git a/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta2/doc.go b/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta2/doc.go
index 30e6e358a58..d7c6d3a9a9a 100644
--- a/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta2/doc.go
+++ b/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta2/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:openapi-gen=true
 
 // Package v1beta2 is the v1beta2 version of the custom_metrics API.
-package v1beta2 // import "k8s.io/metrics/pkg/apis/custom_metrics/v1beta2"
+package v1beta2
diff --git a/staging/src/k8s.io/metrics/pkg/apis/external_metrics/doc.go b/staging/src/k8s.io/metrics/pkg/apis/external_metrics/doc.go
index edf1553ad24..c687cf8661a 100644
--- a/staging/src/k8s.io/metrics/pkg/apis/external_metrics/doc.go
+++ b/staging/src/k8s.io/metrics/pkg/apis/external_metrics/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +groupName=external.metrics.k8s.io
 
 // Package external_metrics adds support for defining external metrics.
-package external_metrics // import "k8s.io/metrics/pkg/apis/external_metrics"
+package external_metrics
diff --git a/staging/src/k8s.io/metrics/pkg/apis/external_metrics/v1beta1/doc.go b/staging/src/k8s.io/metrics/pkg/apis/external_metrics/v1beta1/doc.go
index aa27d102fc9..7e1d6e0abab 100644
--- a/staging/src/k8s.io/metrics/pkg/apis/external_metrics/v1beta1/doc.go
+++ b/staging/src/k8s.io/metrics/pkg/apis/external_metrics/v1beta1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +k8s:openapi-gen=true
 
 // Package v1beta1 is the v1beta1 version of the external metrics API.
-package v1beta1 // import "k8s.io/metrics/pkg/apis/external_metrics/v1beta1"
+package v1beta1
diff --git a/staging/src/k8s.io/metrics/pkg/apis/metrics/doc.go b/staging/src/k8s.io/metrics/pkg/apis/metrics/doc.go
index 9c1153ffc2f..de79b6d0583 100644
--- a/staging/src/k8s.io/metrics/pkg/apis/metrics/doc.go
+++ b/staging/src/k8s.io/metrics/pkg/apis/metrics/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +groupName=metrics.k8s.io
 
 // Package metrics defines an API for exposing metrics.
-package metrics // import "k8s.io/metrics/pkg/apis/metrics"
+package metrics
diff --git a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/doc.go b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/doc.go
index 8e06b220547..6c84d42a205 100644
--- a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/doc.go
+++ b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 // +groupName=metrics.k8s.io
 
 // Package v1alpha1 is the v1alpha1 version of the metrics API.
-package v1alpha1 // import "k8s.io/metrics/pkg/apis/metrics/v1alpha1"
+package v1alpha1
diff --git a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1beta1/doc.go b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1beta1/doc.go
index 10f5ab9fa5f..760a9afbadf 100644
--- a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1beta1/doc.go
+++ b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1beta1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 // +groupName=metrics.k8s.io
 
 // Package v1beta1 is the v1beta1 version of the metrics API.
-package v1beta1 // import "k8s.io/metrics/pkg/apis/metrics/v1beta1"
+package v1beta1
diff --git a/staging/src/k8s.io/mount-utils/doc.go b/staging/src/k8s.io/mount-utils/doc.go
index b7cac03a52e..0e225e0a1b5 100644
--- a/staging/src/k8s.io/mount-utils/doc.go
+++ b/staging/src/k8s.io/mount-utils/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package mount defines an interface to mounting filesystems.
-package mount // import "k8s.io/mount-utils"
+package mount
diff --git a/staging/src/k8s.io/pod-security-admission/admission/api/doc.go b/staging/src/k8s.io/pod-security-admission/admission/api/doc.go
index 7bd45a74bf0..3694a2c6f1a 100644
--- a/staging/src/k8s.io/pod-security-admission/admission/api/doc.go
+++ b/staging/src/k8s.io/pod-security-admission/admission/api/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 
 // Package api contains PodSecurity admission configuration file types
-package api // import "k8s.io/pod-security-admission/admission/api"
+package api
diff --git a/staging/src/k8s.io/pod-security-admission/admission/api/v1/doc.go b/staging/src/k8s.io/pod-security-admission/admission/api/v1/doc.go
index 4ecb5efb531..4d3ac564d73 100644
--- a/staging/src/k8s.io/pod-security-admission/admission/api/v1/doc.go
+++ b/staging/src/k8s.io/pod-security-admission/admission/api/v1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +groupName=pod-security.admission.config.k8s.io
 
 // Package v1 contains PodSecurity admission configuration file types
-package v1 // import "k8s.io/pod-security-admission/admission/api/v1"
+package v1
diff --git a/staging/src/k8s.io/pod-security-admission/admission/api/v1alpha1/doc.go b/staging/src/k8s.io/pod-security-admission/admission/api/v1alpha1/doc.go
index e9f87ec8607..f7d9c1ce612 100644
--- a/staging/src/k8s.io/pod-security-admission/admission/api/v1alpha1/doc.go
+++ b/staging/src/k8s.io/pod-security-admission/admission/api/v1alpha1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +groupName=pod-security.admission.config.k8s.io
 
 // Package v1alpha1 contains PodSecurity admission configuration file types
-package v1alpha1 // import "k8s.io/pod-security-admission/admission/api/v1alpha1"
+package v1alpha1
diff --git a/staging/src/k8s.io/pod-security-admission/admission/api/v1beta1/doc.go b/staging/src/k8s.io/pod-security-admission/admission/api/v1beta1/doc.go
index c8a0452020d..f4a85e72b47 100644
--- a/staging/src/k8s.io/pod-security-admission/admission/api/v1beta1/doc.go
+++ b/staging/src/k8s.io/pod-security-admission/admission/api/v1beta1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // +groupName=pod-security.admission.config.k8s.io
 
 // Package v1beta1 contains PodSecurity admission configuration file types
-package v1beta1 // import "k8s.io/pod-security-admission/admission/api/v1beta1"
+package v1beta1
diff --git a/staging/src/k8s.io/pod-security-admission/admission/doc.go b/staging/src/k8s.io/pod-security-admission/admission/doc.go
index 57c1268f0a6..883a66469ea 100644
--- a/staging/src/k8s.io/pod-security-admission/admission/doc.go
+++ b/staging/src/k8s.io/pod-security-admission/admission/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package admission contains PodSecurity admission logic
-package admission // import "k8s.io/pod-security-admission/admission"
+package admission
diff --git a/staging/src/k8s.io/pod-security-admission/api/doc.go b/staging/src/k8s.io/pod-security-admission/api/doc.go
index a35374be3a4..a03c924a4e2 100644
--- a/staging/src/k8s.io/pod-security-admission/api/doc.go
+++ b/staging/src/k8s.io/pod-security-admission/api/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package api contains constants and helpers for PodSecurity admission label keys and values
-package api // import "k8s.io/pod-security-admission/api"
+package api
diff --git a/staging/src/k8s.io/pod-security-admission/doc.go b/staging/src/k8s.io/pod-security-admission/doc.go
index 70175530663..a3de575a59d 100644
--- a/staging/src/k8s.io/pod-security-admission/doc.go
+++ b/staging/src/k8s.io/pod-security-admission/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package podsecurityadmission is a placeholder until the initial podsecurity implementation is
 // added.
-package podsecurityadmission // import "k8s.io/pod-security-admission"
+package podsecurityadmission
diff --git a/staging/src/k8s.io/pod-security-admission/metrics/doc.go b/staging/src/k8s.io/pod-security-admission/metrics/doc.go
index 27091daf8e2..3e57e07ece8 100644
--- a/staging/src/k8s.io/pod-security-admission/metrics/doc.go
+++ b/staging/src/k8s.io/pod-security-admission/metrics/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package metrics contains metrics interfaces and implementations for PodSecurity admission
-package metrics // import "k8s.io/pod-security-admission/metrics"
+package metrics
diff --git a/staging/src/k8s.io/pod-security-admission/policy/doc.go b/staging/src/k8s.io/pod-security-admission/policy/doc.go
index a6211eb5dd6..f8c5831011b 100644
--- a/staging/src/k8s.io/pod-security-admission/policy/doc.go
+++ b/staging/src/k8s.io/pod-security-admission/policy/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package policy contains implementations of Pod Security Standards checks
-package policy // import "k8s.io/pod-security-admission/policy"
+package policy
diff --git a/staging/src/k8s.io/pod-security-admission/test/doc.go b/staging/src/k8s.io/pod-security-admission/test/doc.go
index 8948f786637..144eb381819 100644
--- a/staging/src/k8s.io/pod-security-admission/test/doc.go
+++ b/staging/src/k8s.io/pod-security-admission/test/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package test contains tests for PodSecurity admission
-package test // import "k8s.io/pod-security-admission/test"
+package test
diff --git a/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/doc.go b/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/doc.go
index 70ddc98f9e4..3417bc9a967 100644
--- a/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/doc.go
+++ b/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +groupName=wardle.example.com
 
 // Package wardle is the internal version of the API.
-package wardle // import "k8s.io/sample-apiserver/pkg/apis/wardle"
+package wardle
diff --git a/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1/doc.go b/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1/doc.go
index fc5bdc44fef..17625ba062d 100644
--- a/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1/doc.go
+++ b/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1/doc.go
@@ -22,4 +22,4 @@ limitations under the License.
 // +groupName=wardle.example.com
 
 // Package v1alpha1 is the v1alpha1 version of the API.
-package v1alpha1 // import "k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1"
+package v1alpha1
diff --git a/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1beta1/doc.go b/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1beta1/doc.go
index 1b8cfa94522..2b7c615aee9 100644
--- a/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1beta1/doc.go
+++ b/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1beta1/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 // +groupName=wardle.example.com
 
 // Package v1beta1 is the v1beta1 version of the API.
-package v1beta1 // import "k8s.io/sample-apiserver/pkg/apis/wardle/v1beta1"
+package v1beta1
diff --git a/staging/src/k8s.io/sample-cli-plugin/doc.go b/staging/src/k8s.io/sample-cli-plugin/doc.go
index 442ca2f840b..53037b23a24 100644
--- a/staging/src/k8s.io/sample-cli-plugin/doc.go
+++ b/staging/src/k8s.io/sample-cli-plugin/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package samplecliplugin // import "k8s.io/sample-cli-plugin"
+package samplecliplugin
diff --git a/staging/src/k8s.io/sample-controller/pkg/apis/samplecontroller/v1alpha1/doc.go b/staging/src/k8s.io/sample-controller/pkg/apis/samplecontroller/v1alpha1/doc.go
index 398a0d34602..e6c135eed8d 100644
--- a/staging/src/k8s.io/sample-controller/pkg/apis/samplecontroller/v1alpha1/doc.go
+++ b/staging/src/k8s.io/sample-controller/pkg/apis/samplecontroller/v1alpha1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +groupName=samplecontroller.k8s.io
 
 // Package v1alpha1 is the v1alpha1 version of the API.
-package v1alpha1 // import "k8s.io/sample-controller/pkg/apis/samplecontroller/v1alpha1"
+package v1alpha1
diff --git a/test/e2e_node/doc.go b/test/e2e_node/doc.go
index b12d2349e72..bcb07abf21a 100644
--- a/test/e2e_node/doc.go
+++ b/test/e2e_node/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package e2enode contains e2e tests specific to the node
-package e2enode // import "k8s.io/kubernetes/test/e2e_node"
+package e2enode
diff --git a/test/integration/doc.go b/test/integration/doc.go
index b82ae6ad947..a5321a95b17 100644
--- a/test/integration/doc.go
+++ b/test/integration/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package integration provides integration tests for Kubernetes.Some tests require a
 // running etcd or Docker installation on the system.
-package integration // import "k8s.io/kubernetes/test/integration"
+package integration