diff --git a/applyconfigurations/doc.go b/applyconfigurations/doc.go
index ac426c60..8efc9523 100644
--- a/applyconfigurations/doc.go
+++ b/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/discovery/doc.go b/discovery/doc.go
index 6baa1ef2..76495588 100644
--- a/discovery/doc.go
+++ b/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/doc.go b/doc.go
index 2d69be71..d0f766a7 100644
--- a/doc.go
+++ b/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/examples/fake-client/doc.go b/examples/fake-client/doc.go
index 9379376e..1c02e5ea 100644
--- a/examples/fake-client/doc.go
+++ b/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/informers/doc.go b/informers/doc.go
index f37c3e4d..231bffb6 100644
--- a/informers/doc.go
+++ b/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/kubernetes/doc.go b/kubernetes/doc.go
index e052f81b..9cef4242 100644
--- a/kubernetes/doc.go
+++ b/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/kubernetes/import.go b/kubernetes/import.go
index c4f9a91b..93f3e4c6 100644
--- a/kubernetes/import.go
+++ b/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/listers/doc.go b/listers/doc.go
index 96c330c9..da6a8040 100644
--- a/listers/doc.go
+++ b/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/pkg/apis/clientauthentication/doc.go b/pkg/apis/clientauthentication/doc.go
index b9945975..486790fa 100644
--- a/pkg/apis/clientauthentication/doc.go
+++ b/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/pkg/apis/clientauthentication/v1/doc.go b/pkg/apis/clientauthentication/v1/doc.go
index 94ca35c2..e378b75c 100644
--- a/pkg/apis/clientauthentication/v1/doc.go
+++ b/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/pkg/apis/clientauthentication/v1beta1/doc.go b/pkg/apis/clientauthentication/v1beta1/doc.go
index 22d1c588..6eb6a981 100644
--- a/pkg/apis/clientauthentication/v1beta1/doc.go
+++ b/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/pkg/version/doc.go b/pkg/version/doc.go
index 05e997e1..c3ace745 100644
--- a/pkg/version/doc.go
+++ b/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/scale/doc.go b/scale/doc.go
index b6fa3f5f..59fd3914 100644
--- a/scale/doc.go
+++ b/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/scale/scheme/appsint/doc.go b/scale/scheme/appsint/doc.go
index 735efb95..16f29e2a 100644
--- a/scale/scheme/appsint/doc.go
+++ b/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/scale/scheme/appsv1beta1/doc.go b/scale/scheme/appsv1beta1/doc.go
index aea95e2e..b9e8cf63 100644
--- a/scale/scheme/appsv1beta1/doc.go
+++ b/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/scale/scheme/appsv1beta2/doc.go b/scale/scheme/appsv1beta2/doc.go
index d1ae2118..b224c4da 100644
--- a/scale/scheme/appsv1beta2/doc.go
+++ b/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/scale/scheme/autoscalingv1/doc.go b/scale/scheme/autoscalingv1/doc.go
index 25f23d2d..2741a8a4 100644
--- a/scale/scheme/autoscalingv1/doc.go
+++ b/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/scale/scheme/doc.go b/scale/scheme/doc.go
index 248b448a..0203d6d5 100644
--- a/scale/scheme/doc.go
+++ b/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/scale/scheme/extensionsint/doc.go b/scale/scheme/extensionsint/doc.go
index dedff2d7..9aaac608 100644
--- a/scale/scheme/extensionsint/doc.go
+++ b/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/scale/scheme/extensionsv1beta1/doc.go b/scale/scheme/extensionsv1beta1/doc.go
index de633889..b5d24f50 100644
--- a/scale/scheme/extensionsv1beta1/doc.go
+++ b/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/tools/cache/doc.go b/tools/cache/doc.go
index 56b61d30..4f593f0d 100644
--- a/tools/cache/doc.go
+++ b/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/tools/clientcmd/api/doc.go b/tools/clientcmd/api/doc.go
index fd913a30..5871575a 100644
--- a/tools/clientcmd/api/doc.go
+++ b/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/tools/clientcmd/api/v1/doc.go b/tools/clientcmd/api/v1/doc.go
index 9e483e9d..3ccdebc1 100644
--- a/tools/clientcmd/api/v1/doc.go
+++ b/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/tools/clientcmd/doc.go b/tools/clientcmd/doc.go
index 424311ee..c07ace6a 100644
--- a/tools/clientcmd/doc.go
+++ b/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/tools/events/doc.go b/tools/events/doc.go
index 8c48f607..08c0ba70 100644
--- a/tools/events/doc.go
+++ b/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/tools/portforward/doc.go b/tools/portforward/doc.go
index 2f534063..e0f6cfbf 100644
--- a/tools/portforward/doc.go
+++ b/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/tools/record/doc.go b/tools/record/doc.go
index 33d5fe78..23a35758 100644
--- a/tools/record/doc.go
+++ b/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/tools/remotecommand/doc.go b/tools/remotecommand/doc.go
index ac06a9cd..b9f0db2d 100644
--- a/tools/remotecommand/doc.go
+++ b/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/util/jsonpath/doc.go b/util/jsonpath/doc.go
index 0effb15c..2a6e1706 100644
--- a/util/jsonpath/doc.go
+++ b/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/util/workqueue/doc.go b/util/workqueue/doc.go
index 8555aa95..a76d830e 100644
--- a/util/workqueue/doc.go
+++ b/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