diff --git a/pkg/apis/apps/register.go b/pkg/apis/apps/register.go
index 77d8445ae14..aae53d169ef 100644
--- a/pkg/apis/apps/register.go
+++ b/pkg/apis/apps/register.go
@@ -43,7 +43,7 @@ func Resource(resource string) schema.GroupResource {
 	return SchemeGroupVersion.WithResource(resource).GroupResource()
 }
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	// TODO this will get cleaned up with the scheme types are fixed
 	scheme.AddKnownTypes(SchemeGroupVersion,
diff --git a/pkg/apis/autoscaling/register.go b/pkg/apis/autoscaling/register.go
index 2bcea84b9bf..6c321a3abab 100644
--- a/pkg/apis/autoscaling/register.go
+++ b/pkg/apis/autoscaling/register.go
@@ -42,7 +42,7 @@ var (
 	AddToScheme   = SchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&Scale{},
diff --git a/pkg/apis/batch/register.go b/pkg/apis/batch/register.go
index 49414bd3fce..3b4a6d40678 100644
--- a/pkg/apis/batch/register.go
+++ b/pkg/apis/batch/register.go
@@ -42,7 +42,7 @@ var (
 	AddToScheme   = SchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&Job{},
diff --git a/pkg/apis/certificates/register.go b/pkg/apis/certificates/register.go
index 085737583fc..a876251ca43 100644
--- a/pkg/apis/certificates/register.go
+++ b/pkg/apis/certificates/register.go
@@ -42,7 +42,7 @@ func Resource(resource string) schema.GroupResource {
 	return SchemeGroupVersion.WithResource(resource).GroupResource()
 }
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&CertificateSigningRequest{},
diff --git a/pkg/apis/extensions/register.go b/pkg/apis/extensions/register.go
index 780f58dc747..7db398c6c69 100644
--- a/pkg/apis/extensions/register.go
+++ b/pkg/apis/extensions/register.go
@@ -43,7 +43,7 @@ var (
 	AddToScheme   = SchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	// TODO this gets cleaned up when the types are fixed
 	scheme.AddKnownTypes(SchemeGroupVersion,
diff --git a/pkg/apis/policy/register.go b/pkg/apis/policy/register.go
index 5aadc3f1b8e..80e834b385d 100644
--- a/pkg/apis/policy/register.go
+++ b/pkg/apis/policy/register.go
@@ -42,7 +42,7 @@ var (
 	AddToScheme   = SchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	// TODO this gets cleaned up when the types are fixed
 	scheme.AddKnownTypes(SchemeGroupVersion,
diff --git a/pkg/apis/policy/v1alpha1/register.go b/pkg/apis/policy/v1alpha1/register.go
index 78092cecf5c..bf88a1e194d 100644
--- a/pkg/apis/policy/v1alpha1/register.go
+++ b/pkg/apis/policy/v1alpha1/register.go
@@ -48,7 +48,7 @@ func init() {
 	localSchemeBuilder.Register(addKnownTypes, RegisterDefaults)
 }
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&PodDisruptionBudget{},
diff --git a/pkg/apis/rbac/register.go b/pkg/apis/rbac/register.go
index f4a838bd89a..4f232951512 100644
--- a/pkg/apis/rbac/register.go
+++ b/pkg/apis/rbac/register.go
@@ -41,7 +41,7 @@ var (
 	AddToScheme   = SchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&Role{},
diff --git a/pkg/apis/settings/register.go b/pkg/apis/settings/register.go
index 85847012793..7b144b7dfc8 100644
--- a/pkg/apis/settings/register.go
+++ b/pkg/apis/settings/register.go
@@ -42,7 +42,7 @@ func Resource(resource string) schema.GroupResource {
 	return SchemeGroupVersion.WithResource(resource).GroupResource()
 }
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&PodPreset{},
diff --git a/pkg/controller/podautoscaler/horizontal.go b/pkg/controller/podautoscaler/horizontal.go
index b714aa077e4..e9719f8fcfb 100644
--- a/pkg/controller/podautoscaler/horizontal.go
+++ b/pkg/controller/podautoscaler/horizontal.go
@@ -623,7 +623,7 @@ func (a *HorizontalController) updateStatus(hpa *autoscalingv2.HorizontalPodAuto
 	return nil
 }
 
-// unsafeConvertToVersionVia is like api.Scheme.UnsafeConvertToVersion, but it does so via an internal version first.
+// unsafeConvertToVersionVia is like Scheme.UnsafeConvertToVersion, but it does so via an internal version first.
 // We use it since working with v2alpha1 is convenient here, but we want to use the v1 client (and
 // can't just use the internal version).  Note that conversion mutates the object, so you need to deepcopy
 // *before* you call this if the input object came out of a shared cache.
diff --git a/staging/src/k8s.io/api/admission/v1alpha1/register.go b/staging/src/k8s.io/api/admission/v1alpha1/register.go
index ea6d5609af3..e1f8255a3ff 100644
--- a/staging/src/k8s.io/api/admission/v1alpha1/register.go
+++ b/staging/src/k8s.io/api/admission/v1alpha1/register.go
@@ -41,7 +41,7 @@ var (
 	AddToScheme        = localSchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&AdmissionReview{},
diff --git a/staging/src/k8s.io/api/apps/v1/register.go b/staging/src/k8s.io/api/apps/v1/register.go
index 586b53ef0e9..a813d93cb0f 100644
--- a/staging/src/k8s.io/api/apps/v1/register.go
+++ b/staging/src/k8s.io/api/apps/v1/register.go
@@ -41,7 +41,7 @@ var (
 	AddToScheme        = localSchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&DaemonSet{},
diff --git a/staging/src/k8s.io/api/apps/v1beta1/register.go b/staging/src/k8s.io/api/apps/v1beta1/register.go
index 84789be618d..5b16819f2f6 100644
--- a/staging/src/k8s.io/api/apps/v1beta1/register.go
+++ b/staging/src/k8s.io/api/apps/v1beta1/register.go
@@ -41,7 +41,7 @@ var (
 	AddToScheme        = localSchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&Deployment{},
diff --git a/staging/src/k8s.io/api/apps/v1beta2/register.go b/staging/src/k8s.io/api/apps/v1beta2/register.go
index e207c7dc5a9..2784ee37712 100644
--- a/staging/src/k8s.io/api/apps/v1beta2/register.go
+++ b/staging/src/k8s.io/api/apps/v1beta2/register.go
@@ -41,7 +41,7 @@ var (
 	AddToScheme        = localSchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&Deployment{},
diff --git a/staging/src/k8s.io/api/authentication/v1/register.go b/staging/src/k8s.io/api/authentication/v1/register.go
index 936237c2be8..2ca79a620a5 100644
--- a/staging/src/k8s.io/api/authentication/v1/register.go
+++ b/staging/src/k8s.io/api/authentication/v1/register.go
@@ -41,7 +41,7 @@ var (
 	AddToScheme        = localSchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&TokenReview{},
diff --git a/staging/src/k8s.io/api/authentication/v1beta1/register.go b/staging/src/k8s.io/api/authentication/v1beta1/register.go
index 7d89e5ef70c..ed23e50f7e9 100644
--- a/staging/src/k8s.io/api/authentication/v1beta1/register.go
+++ b/staging/src/k8s.io/api/authentication/v1beta1/register.go
@@ -41,7 +41,7 @@ var (
 	AddToScheme        = localSchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&TokenReview{},
diff --git a/staging/src/k8s.io/api/authorization/v1/register.go b/staging/src/k8s.io/api/authorization/v1/register.go
index d716eaa98da..59311981e12 100644
--- a/staging/src/k8s.io/api/authorization/v1/register.go
+++ b/staging/src/k8s.io/api/authorization/v1/register.go
@@ -41,7 +41,7 @@ var (
 	AddToScheme        = localSchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&SelfSubjectRulesReview{},
diff --git a/staging/src/k8s.io/api/authorization/v1beta1/register.go b/staging/src/k8s.io/api/authorization/v1beta1/register.go
index d8116d5a47a..84255dd6c90 100644
--- a/staging/src/k8s.io/api/authorization/v1beta1/register.go
+++ b/staging/src/k8s.io/api/authorization/v1beta1/register.go
@@ -41,7 +41,7 @@ var (
 	AddToScheme        = localSchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&SelfSubjectRulesReview{},
diff --git a/staging/src/k8s.io/api/autoscaling/v1/register.go b/staging/src/k8s.io/api/autoscaling/v1/register.go
index 521c0e4a3dc..8dfe361edf5 100644
--- a/staging/src/k8s.io/api/autoscaling/v1/register.go
+++ b/staging/src/k8s.io/api/autoscaling/v1/register.go
@@ -41,7 +41,7 @@ var (
 	AddToScheme        = localSchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&HorizontalPodAutoscaler{},
diff --git a/staging/src/k8s.io/api/autoscaling/v2beta1/register.go b/staging/src/k8s.io/api/autoscaling/v2beta1/register.go
index 9025b421c82..12d697f0130 100644
--- a/staging/src/k8s.io/api/autoscaling/v2beta1/register.go
+++ b/staging/src/k8s.io/api/autoscaling/v2beta1/register.go
@@ -41,7 +41,7 @@ var (
 	AddToScheme        = localSchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&HorizontalPodAutoscaler{},
diff --git a/staging/src/k8s.io/api/batch/v1/register.go b/staging/src/k8s.io/api/batch/v1/register.go
index 2cdfc98ca42..32fa51f0e4a 100644
--- a/staging/src/k8s.io/api/batch/v1/register.go
+++ b/staging/src/k8s.io/api/batch/v1/register.go
@@ -41,7 +41,7 @@ var (
 	AddToScheme        = localSchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&Job{},
diff --git a/staging/src/k8s.io/api/batch/v1beta1/register.go b/staging/src/k8s.io/api/batch/v1beta1/register.go
index 569817d3e4f..226de49f4d2 100644
--- a/staging/src/k8s.io/api/batch/v1beta1/register.go
+++ b/staging/src/k8s.io/api/batch/v1beta1/register.go
@@ -41,7 +41,7 @@ var (
 	AddToScheme        = localSchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&JobTemplate{},
diff --git a/staging/src/k8s.io/api/batch/v2alpha1/register.go b/staging/src/k8s.io/api/batch/v2alpha1/register.go
index 4b02c0f481c..ac7fa5087a9 100644
--- a/staging/src/k8s.io/api/batch/v2alpha1/register.go
+++ b/staging/src/k8s.io/api/batch/v2alpha1/register.go
@@ -41,7 +41,7 @@ var (
 	AddToScheme        = localSchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&JobTemplate{},
diff --git a/staging/src/k8s.io/api/certificates/v1beta1/register.go b/staging/src/k8s.io/api/certificates/v1beta1/register.go
index b5ba3d7eca8..b4f3af9b9ca 100644
--- a/staging/src/k8s.io/api/certificates/v1beta1/register.go
+++ b/staging/src/k8s.io/api/certificates/v1beta1/register.go
@@ -46,7 +46,7 @@ var (
 	AddToScheme        = localSchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&CertificateSigningRequest{},
diff --git a/staging/src/k8s.io/api/core/v1/register.go b/staging/src/k8s.io/api/core/v1/register.go
index 4916ee3c23c..62bf076ebc0 100644
--- a/staging/src/k8s.io/api/core/v1/register.go
+++ b/staging/src/k8s.io/api/core/v1/register.go
@@ -43,7 +43,7 @@ var (
 	AddToScheme   = SchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&Pod{},
diff --git a/staging/src/k8s.io/api/extensions/v1beta1/register.go b/staging/src/k8s.io/api/extensions/v1beta1/register.go
index 626701cf013..17232e92b1a 100644
--- a/staging/src/k8s.io/api/extensions/v1beta1/register.go
+++ b/staging/src/k8s.io/api/extensions/v1beta1/register.go
@@ -41,7 +41,7 @@ var (
 	AddToScheme        = localSchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&Deployment{},
diff --git a/staging/src/k8s.io/api/imagepolicy/v1alpha1/register.go b/staging/src/k8s.io/api/imagepolicy/v1alpha1/register.go
index 3e762bb4f94..477571bbb27 100644
--- a/staging/src/k8s.io/api/imagepolicy/v1alpha1/register.go
+++ b/staging/src/k8s.io/api/imagepolicy/v1alpha1/register.go
@@ -41,7 +41,7 @@ var (
 	AddToScheme        = localSchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&ImageReview{},
diff --git a/staging/src/k8s.io/api/networking/v1/register.go b/staging/src/k8s.io/api/networking/v1/register.go
index 2ba9951d8ad..f47f22e9e88 100644
--- a/staging/src/k8s.io/api/networking/v1/register.go
+++ b/staging/src/k8s.io/api/networking/v1/register.go
@@ -41,7 +41,7 @@ var (
 	AddToScheme        = localSchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&NetworkPolicy{},
diff --git a/staging/src/k8s.io/api/policy/v1beta1/register.go b/staging/src/k8s.io/api/policy/v1beta1/register.go
index e0c6247a790..d77f1304070 100644
--- a/staging/src/k8s.io/api/policy/v1beta1/register.go
+++ b/staging/src/k8s.io/api/policy/v1beta1/register.go
@@ -41,7 +41,7 @@ var (
 	AddToScheme        = localSchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&PodDisruptionBudget{},
diff --git a/staging/src/k8s.io/api/rbac/v1/register.go b/staging/src/k8s.io/api/rbac/v1/register.go
index 7336b5455e6..8f1fd460a21 100644
--- a/staging/src/k8s.io/api/rbac/v1/register.go
+++ b/staging/src/k8s.io/api/rbac/v1/register.go
@@ -40,7 +40,7 @@ var (
 	AddToScheme        = localSchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&Role{},
diff --git a/staging/src/k8s.io/api/rbac/v1alpha1/register.go b/staging/src/k8s.io/api/rbac/v1alpha1/register.go
index 9cfd71f451e..0c6977685be 100644
--- a/staging/src/k8s.io/api/rbac/v1alpha1/register.go
+++ b/staging/src/k8s.io/api/rbac/v1alpha1/register.go
@@ -40,7 +40,7 @@ var (
 	AddToScheme        = localSchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&Role{},
diff --git a/staging/src/k8s.io/api/rbac/v1beta1/register.go b/staging/src/k8s.io/api/rbac/v1beta1/register.go
index 8f60f01953f..c8526a656ba 100644
--- a/staging/src/k8s.io/api/rbac/v1beta1/register.go
+++ b/staging/src/k8s.io/api/rbac/v1beta1/register.go
@@ -40,7 +40,7 @@ var (
 	AddToScheme        = localSchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&Role{},
diff --git a/staging/src/k8s.io/api/scheduling/v1alpha1/register.go b/staging/src/k8s.io/api/scheduling/v1alpha1/register.go
index 91ce6e0cc3a..24689f0ad84 100644
--- a/staging/src/k8s.io/api/scheduling/v1alpha1/register.go
+++ b/staging/src/k8s.io/api/scheduling/v1alpha1/register.go
@@ -41,7 +41,7 @@ var (
 	AddToScheme        = localSchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&PriorityClass{},
diff --git a/staging/src/k8s.io/api/settings/v1alpha1/register.go b/staging/src/k8s.io/api/settings/v1alpha1/register.go
index 2f39af0f9b2..eee278d9592 100644
--- a/staging/src/k8s.io/api/settings/v1alpha1/register.go
+++ b/staging/src/k8s.io/api/settings/v1alpha1/register.go
@@ -41,7 +41,7 @@ var (
 	AddToScheme        = localSchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&PodPreset{},
diff --git a/staging/src/k8s.io/api/storage/v1/register.go b/staging/src/k8s.io/api/storage/v1/register.go
index 59c4e59ba19..c058add8400 100644
--- a/staging/src/k8s.io/api/storage/v1/register.go
+++ b/staging/src/k8s.io/api/storage/v1/register.go
@@ -41,7 +41,7 @@ var (
 	AddToScheme        = localSchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&StorageClass{},
diff --git a/staging/src/k8s.io/api/storage/v1beta1/register.go b/staging/src/k8s.io/api/storage/v1beta1/register.go
index 759ba81aa9b..7f1f0c8e835 100644
--- a/staging/src/k8s.io/api/storage/v1beta1/register.go
+++ b/staging/src/k8s.io/api/storage/v1beta1/register.go
@@ -41,7 +41,7 @@ var (
 	AddToScheme        = localSchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&StorageClass{},
diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/register.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/register.go
index df3bc363f3e..273f7f123b6 100644
--- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/register.go
+++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/register.go
@@ -41,7 +41,7 @@ var (
 	AddToScheme   = SchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&CustomResourceDefinition{},
diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/register.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/register.go
index 8ced548fa96..77f849975f8 100644
--- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/register.go
+++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/register.go
@@ -43,7 +43,7 @@ var (
 	AddToScheme        = localSchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&CustomResourceDefinition{},
diff --git a/staging/src/k8s.io/apimachinery/pkg/apimachinery/registered/registered.go b/staging/src/k8s.io/apimachinery/pkg/apimachinery/registered/registered.go
index 5150db01659..0da94f50f60 100644
--- a/staging/src/k8s.io/apimachinery/pkg/apimachinery/registered/registered.go
+++ b/staging/src/k8s.io/apimachinery/pkg/apimachinery/registered/registered.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package to keep track of API Versions that can be registered and are enabled in api.Scheme.
+// Package to keep track of API Versions that can be registered and are enabled in a Scheme.
 package registered
 
 import (
diff --git a/staging/src/k8s.io/apimachinery/pkg/apimachinery/types.go b/staging/src/k8s.io/apimachinery/pkg/apimachinery/types.go
index 213e34bc00e..baca784fad1 100644
--- a/staging/src/k8s.io/apimachinery/pkg/apimachinery/types.go
+++ b/staging/src/k8s.io/apimachinery/pkg/apimachinery/types.go
@@ -38,7 +38,7 @@ type GroupMeta struct {
 	// to go through the InterfacesFor method below.
 	SelfLinker runtime.SelfLinker
 
-	// RESTMapper provides the default mapping between REST paths and the objects declared in api.Scheme and all known
+	// RESTMapper provides the default mapping between REST paths and the objects declared in a Scheme and all known
 	// versions.
 	RESTMapper meta.RESTMapper
 
diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/register.go b/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/register.go
index cbf628fc780..ab2afcf7298 100644
--- a/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/register.go
+++ b/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/register.go
@@ -42,7 +42,7 @@ func Resource(resource string) schema.GroupResource {
 	return SchemeGroupVersion.WithResource(resource).GroupResource()
 }
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&Carp{},
diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/v1/register.go b/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/v1/register.go
index d04bc1b58ab..8658a683fc2 100644
--- a/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/v1/register.go
+++ b/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/v1/register.go
@@ -53,7 +53,7 @@ func init() {
 	localSchemeBuilder.Register(addKnownTypes, addConversionFuncs, addDefaultingFuncs)
 }
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&Carp{},
diff --git a/staging/src/k8s.io/apiserver/pkg/apis/apiserver/register.go b/staging/src/k8s.io/apiserver/pkg/apis/apiserver/register.go
index 1410518b9ed..ffe9942a6cc 100644
--- a/staging/src/k8s.io/apiserver/pkg/apis/apiserver/register.go
+++ b/staging/src/k8s.io/apiserver/pkg/apis/apiserver/register.go
@@ -41,7 +41,7 @@ var (
 	AddToScheme   = SchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&AdmissionConfiguration{},
diff --git a/staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1alpha1/register.go b/staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1alpha1/register.go
index 090adec3201..466b19ae5bb 100644
--- a/staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1alpha1/register.go
+++ b/staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1alpha1/register.go
@@ -42,7 +42,7 @@ func init() {
 	localSchemeBuilder.Register(addKnownTypes)
 }
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&AdmissionConfiguration{},
diff --git a/staging/src/k8s.io/apiserver/pkg/apis/example/register.go b/staging/src/k8s.io/apiserver/pkg/apis/example/register.go
index 2b699c4b495..adaced616c2 100644
--- a/staging/src/k8s.io/apiserver/pkg/apis/example/register.go
+++ b/staging/src/k8s.io/apiserver/pkg/apis/example/register.go
@@ -42,7 +42,7 @@ func Resource(resource string) schema.GroupResource {
 	return SchemeGroupVersion.WithResource(resource).GroupResource()
 }
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&Pod{},
diff --git a/staging/src/k8s.io/apiserver/pkg/apis/example/v1/register.go b/staging/src/k8s.io/apiserver/pkg/apis/example/v1/register.go
index f7b6c7df61a..cfb74eea47e 100644
--- a/staging/src/k8s.io/apiserver/pkg/apis/example/v1/register.go
+++ b/staging/src/k8s.io/apiserver/pkg/apis/example/v1/register.go
@@ -53,7 +53,7 @@ func init() {
 	localSchemeBuilder.Register(addKnownTypes, addConversionFuncs, addDefaultingFuncs)
 }
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&Pod{},
diff --git a/staging/src/k8s.io/code-generator/_examples/apiserver/apis/example/register.go b/staging/src/k8s.io/code-generator/_examples/apiserver/apis/example/register.go
index 05578d50f54..2fd3155253f 100644
--- a/staging/src/k8s.io/code-generator/_examples/apiserver/apis/example/register.go
+++ b/staging/src/k8s.io/code-generator/_examples/apiserver/apis/example/register.go
@@ -33,7 +33,7 @@ func Resource(resource string) schema.GroupResource {
 	return SchemeGroupVersion.WithResource(resource).GroupResource()
 }
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&TestType{},
diff --git a/staging/src/k8s.io/code-generator/_examples/apiserver/apis/example/v1/register.go b/staging/src/k8s.io/code-generator/_examples/apiserver/apis/example/v1/register.go
index 99abd7d58fb..c99619d7acf 100644
--- a/staging/src/k8s.io/code-generator/_examples/apiserver/apis/example/v1/register.go
+++ b/staging/src/k8s.io/code-generator/_examples/apiserver/apis/example/v1/register.go
@@ -44,7 +44,7 @@ func Resource(resource string) schema.GroupResource {
 	return SchemeGroupVersion.WithResource(resource).GroupResource()
 }
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&TestType{},
diff --git a/staging/src/k8s.io/code-generator/_examples/crd/apis/example/v1/register.go b/staging/src/k8s.io/code-generator/_examples/crd/apis/example/v1/register.go
index 97603b4341e..58371e0e943 100644
--- a/staging/src/k8s.io/code-generator/_examples/crd/apis/example/v1/register.go
+++ b/staging/src/k8s.io/code-generator/_examples/crd/apis/example/v1/register.go
@@ -44,7 +44,7 @@ func Resource(resource string) schema.GroupResource {
 	return SchemeGroupVersion.WithResource(resource).GroupResource()
 }
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&TestType{},
diff --git a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/register.go b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/register.go
index 6a18624f511..2ab61e9b4fe 100644
--- a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/register.go
+++ b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/register.go
@@ -41,7 +41,7 @@ var (
 	AddToScheme   = SchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&APIService{},
diff --git a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/register.go b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/register.go
index a8823629f29..38babafa9ea 100644
--- a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/register.go
+++ b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/register.go
@@ -47,7 +47,7 @@ func init() {
 	localSchemeBuilder.Register(addKnownTypes)
 }
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&APIService{},
diff --git a/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/register.go b/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/register.go
index 8d210252047..4e7f6407d13 100644
--- a/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/register.go
+++ b/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/register.go
@@ -41,7 +41,7 @@ var (
 	AddToScheme   = SchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&Flunder{},
diff --git a/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1/register.go b/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1/register.go
index 6d69fd63aca..4ceaf3d394f 100644
--- a/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1/register.go
+++ b/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1/register.go
@@ -42,7 +42,7 @@ func init() {
 	localSchemeBuilder.Register(addKnownTypes)
 }
 
-// Adds the list of known types to api.Scheme.
+// Adds the list of known types to the given scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&Flunder{},