diff --git a/pkg/apis/abac/v0/conversion_test.go b/pkg/apis/abac/v0/conversion_test.go
index 419005da17d..c71ba1528c3 100644
--- a/pkg/apis/abac/v0/conversion_test.go
+++ b/pkg/apis/abac/v0/conversion_test.go
@@ -21,64 +21,64 @@ import (
 	"testing"
 
 	"k8s.io/apiserver/pkg/authentication/user"
-	api "k8s.io/kubernetes/pkg/apis/abac"
+	"k8s.io/kubernetes/pkg/apis/abac"
 	"k8s.io/kubernetes/pkg/apis/abac/v0"
 )
 
 func TestV0Conversion(t *testing.T) {
 	testcases := map[string]struct {
 		old      *v0.Policy
-		expected *api.Policy
+		expected *abac.Policy
 	}{
 		// a completely empty policy rule allows everything to all users
 		"empty": {
 			old:      &v0.Policy{},
-			expected: &api.Policy{Spec: api.PolicySpec{Group: user.AllAuthenticated, Readonly: false, NonResourcePath: "*", Namespace: "*", Resource: "*", APIGroup: "*"}},
+			expected: &abac.Policy{Spec: abac.PolicySpec{Group: user.AllAuthenticated, Readonly: false, NonResourcePath: "*", Namespace: "*", Resource: "*", APIGroup: "*"}},
 		},
 
 		// specifying a user is preserved
 		"user": {
 			old:      &v0.Policy{User: "bob"},
-			expected: &api.Policy{Spec: api.PolicySpec{User: "bob", Readonly: false, NonResourcePath: "*", Namespace: "*", Resource: "*", APIGroup: "*"}},
+			expected: &abac.Policy{Spec: abac.PolicySpec{User: "bob", Readonly: false, NonResourcePath: "*", Namespace: "*", Resource: "*", APIGroup: "*"}},
 		},
 
 		// specifying a group is preserved (and no longer matches all users)
 		"group": {
 			old:      &v0.Policy{Group: "mygroup"},
-			expected: &api.Policy{Spec: api.PolicySpec{Group: "mygroup", Readonly: false, NonResourcePath: "*", Namespace: "*", Resource: "*", APIGroup: "*"}},
+			expected: &abac.Policy{Spec: abac.PolicySpec{Group: "mygroup", Readonly: false, NonResourcePath: "*", Namespace: "*", Resource: "*", APIGroup: "*"}},
 		},
 
 		// specifying * for user or group maps to all authenticated subjects
 		"* user": {
 			old:      &v0.Policy{User: "*"},
-			expected: &api.Policy{Spec: api.PolicySpec{Group: user.AllAuthenticated, Readonly: false, NonResourcePath: "*", Namespace: "*", Resource: "*", APIGroup: "*"}},
+			expected: &abac.Policy{Spec: abac.PolicySpec{Group: user.AllAuthenticated, Readonly: false, NonResourcePath: "*", Namespace: "*", Resource: "*", APIGroup: "*"}},
 		},
 		"* group": {
 			old:      &v0.Policy{Group: "*"},
-			expected: &api.Policy{Spec: api.PolicySpec{Group: user.AllAuthenticated, Readonly: false, NonResourcePath: "*", Namespace: "*", Resource: "*", APIGroup: "*"}},
+			expected: &abac.Policy{Spec: abac.PolicySpec{Group: user.AllAuthenticated, Readonly: false, NonResourcePath: "*", Namespace: "*", Resource: "*", APIGroup: "*"}},
 		},
 
 		// specifying a namespace removes the * match on non-resource path
 		"namespace": {
 			old:      &v0.Policy{Namespace: "myns"},
-			expected: &api.Policy{Spec: api.PolicySpec{Group: user.AllAuthenticated, Readonly: false, NonResourcePath: "", Namespace: "myns", Resource: "*", APIGroup: "*"}},
+			expected: &abac.Policy{Spec: abac.PolicySpec{Group: user.AllAuthenticated, Readonly: false, NonResourcePath: "", Namespace: "myns", Resource: "*", APIGroup: "*"}},
 		},
 
 		// specifying a resource removes the * match on non-resource path
 		"resource": {
 			old:      &v0.Policy{Resource: "myresource"},
-			expected: &api.Policy{Spec: api.PolicySpec{Group: user.AllAuthenticated, Readonly: false, NonResourcePath: "", Namespace: "*", Resource: "myresource", APIGroup: "*"}},
+			expected: &abac.Policy{Spec: abac.PolicySpec{Group: user.AllAuthenticated, Readonly: false, NonResourcePath: "", Namespace: "*", Resource: "myresource", APIGroup: "*"}},
 		},
 
 		// specifying a namespace+resource removes the * match on non-resource path
 		"namespace+resource": {
 			old:      &v0.Policy{Namespace: "myns", Resource: "myresource"},
-			expected: &api.Policy{Spec: api.PolicySpec{Group: user.AllAuthenticated, Readonly: false, NonResourcePath: "", Namespace: "myns", Resource: "myresource", APIGroup: "*"}},
+			expected: &abac.Policy{Spec: abac.PolicySpec{Group: user.AllAuthenticated, Readonly: false, NonResourcePath: "", Namespace: "myns", Resource: "myresource", APIGroup: "*"}},
 		},
 	}
 	for k, tc := range testcases {
-		internal := &api.Policy{}
-		if err := api.Scheme.Convert(tc.old, internal, nil); err != nil {
+		internal := &abac.Policy{}
+		if err := abac.Scheme.Convert(tc.old, internal, nil); err != nil {
 			t.Errorf("%s: unexpected error: %v", k, err)
 		}
 		if !reflect.DeepEqual(internal, tc.expected) {
diff --git a/pkg/apis/abac/v0/register.go b/pkg/apis/abac/v0/register.go
index 4efcc092961..9a5aa984549 100644
--- a/pkg/apis/abac/v0/register.go
+++ b/pkg/apis/abac/v0/register.go
@@ -19,7 +19,7 @@ package v0
 import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	api "k8s.io/kubernetes/pkg/apis/abac"
+	"k8s.io/kubernetes/pkg/apis/abac"
 )
 
 const GroupName = "abac.authorization.kubernetes.io"
@@ -29,11 +29,11 @@ var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v0"}
 
 func init() {
 	// TODO: Delete this init function, abac should not have its own scheme.
-	if err := addKnownTypes(api.Scheme); err != nil {
+	if err := addKnownTypes(abac.Scheme); err != nil {
 		// Programmer error.
 		panic(err)
 	}
-	if err := addConversionFuncs(api.Scheme); err != nil {
+	if err := addConversionFuncs(abac.Scheme); err != nil {
 		// Programmer error.
 		panic(err)
 	}
diff --git a/pkg/apis/abac/v1beta1/conversion_test.go b/pkg/apis/abac/v1beta1/conversion_test.go
index 0f04c416b9f..814eb3f6142 100644
--- a/pkg/apis/abac/v1beta1/conversion_test.go
+++ b/pkg/apis/abac/v1beta1/conversion_test.go
@@ -21,40 +21,40 @@ import (
 	"testing"
 
 	"k8s.io/apiserver/pkg/authentication/user"
-	api "k8s.io/kubernetes/pkg/apis/abac"
+	"k8s.io/kubernetes/pkg/apis/abac"
 	"k8s.io/kubernetes/pkg/apis/abac/v1beta1"
 )
 
 func TestV1Beta1Conversion(t *testing.T) {
 	testcases := map[string]struct {
 		old      *v1beta1.Policy
-		expected *api.Policy
+		expected *abac.Policy
 	}{
 		// specifying a user is preserved
 		"user": {
 			old:      &v1beta1.Policy{Spec: v1beta1.PolicySpec{User: "bob"}},
-			expected: &api.Policy{Spec: api.PolicySpec{User: "bob"}},
+			expected: &abac.Policy{Spec: abac.PolicySpec{User: "bob"}},
 		},
 
 		// specifying a group is preserved
 		"group": {
 			old:      &v1beta1.Policy{Spec: v1beta1.PolicySpec{Group: "mygroup"}},
-			expected: &api.Policy{Spec: api.PolicySpec{Group: "mygroup"}},
+			expected: &abac.Policy{Spec: abac.PolicySpec{Group: "mygroup"}},
 		},
 
 		// specifying * for user or group maps to all authenticated subjects
 		"* user": {
 			old:      &v1beta1.Policy{Spec: v1beta1.PolicySpec{User: "*"}},
-			expected: &api.Policy{Spec: api.PolicySpec{Group: user.AllAuthenticated}},
+			expected: &abac.Policy{Spec: abac.PolicySpec{Group: user.AllAuthenticated}},
 		},
 		"* group": {
 			old:      &v1beta1.Policy{Spec: v1beta1.PolicySpec{Group: "*"}},
-			expected: &api.Policy{Spec: api.PolicySpec{Group: user.AllAuthenticated}},
+			expected: &abac.Policy{Spec: abac.PolicySpec{Group: user.AllAuthenticated}},
 		},
 	}
 	for k, tc := range testcases {
-		internal := &api.Policy{}
-		if err := api.Scheme.Convert(tc.old, internal, nil); err != nil {
+		internal := &abac.Policy{}
+		if err := abac.Scheme.Convert(tc.old, internal, nil); err != nil {
 			t.Errorf("%s: unexpected error: %v", k, err)
 		}
 		if !reflect.DeepEqual(internal, tc.expected) {
diff --git a/pkg/apis/abac/v1beta1/register.go b/pkg/apis/abac/v1beta1/register.go
index e157a69aac6..a7fc1158ea0 100644
--- a/pkg/apis/abac/v1beta1/register.go
+++ b/pkg/apis/abac/v1beta1/register.go
@@ -19,7 +19,7 @@ package v1beta1
 import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	api "k8s.io/kubernetes/pkg/apis/abac"
+	"k8s.io/kubernetes/pkg/apis/abac"
 )
 
 const GroupName = "abac.authorization.kubernetes.io"
@@ -29,11 +29,11 @@ var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1beta1
 
 func init() {
 	// TODO: delete this, abac should not have its own scheme.
-	if err := addKnownTypes(api.Scheme); err != nil {
+	if err := addKnownTypes(abac.Scheme); err != nil {
 		// Programmer error.
 		panic(err)
 	}
-	if err := addConversionFuncs(api.Scheme); err != nil {
+	if err := addConversionFuncs(abac.Scheme); err != nil {
 		// Programmer error.
 		panic(err)
 	}
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/auth/authorizer/abac/abac.go b/pkg/auth/authorizer/abac/abac.go
index 5e56c19ba9c..956c1f70866 100644
--- a/pkg/auth/authorizer/abac/abac.go
+++ b/pkg/auth/authorizer/abac/abac.go
@@ -30,7 +30,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apiserver/pkg/authentication/user"
 	"k8s.io/apiserver/pkg/authorization/authorizer"
-	api "k8s.io/kubernetes/pkg/apis/abac"
+	"k8s.io/kubernetes/pkg/apis/abac"
 	_ "k8s.io/kubernetes/pkg/apis/abac/latest"
 	"k8s.io/kubernetes/pkg/apis/abac/v0"
 )
@@ -49,7 +49,7 @@ func (p policyLoadError) Error() string {
 	return fmt.Sprintf("error reading policy file %s: %v", p.path, p.err)
 }
 
-type policyList []*api.Policy
+type policyList []*abac.Policy
 
 // TODO: Have policies be created via an API call and stored in REST storage.
 func NewFromFile(path string) (policyList, error) {
@@ -64,13 +64,13 @@ func NewFromFile(path string) (policyList, error) {
 	scanner := bufio.NewScanner(file)
 	pl := make(policyList, 0)
 
-	decoder := api.Codecs.UniversalDecoder()
+	decoder := abac.Codecs.UniversalDecoder()
 
 	i := 0
 	unversionedLines := 0
 	for scanner.Scan() {
 		i++
-		p := &api.Policy{}
+		p := &abac.Policy{}
 		b := scanner.Bytes()
 
 		// skip comment lines and blank lines
@@ -90,14 +90,14 @@ func NewFromFile(path string) (policyList, error) {
 			if err := runtime.DecodeInto(decoder, b, oldPolicy); err != nil {
 				return nil, policyLoadError{path, i, b, err}
 			}
-			if err := api.Scheme.Convert(oldPolicy, p, nil); err != nil {
+			if err := abac.Scheme.Convert(oldPolicy, p, nil); err != nil {
 				return nil, policyLoadError{path, i, b, err}
 			}
 			pl = append(pl, p)
 			continue
 		}
 
-		decodedPolicy, ok := decodedObj.(*api.Policy)
+		decodedPolicy, ok := decodedObj.(*abac.Policy)
 		if !ok {
 			return nil, policyLoadError{path, i, b, fmt.Errorf("unrecognized object: %#v", decodedObj)}
 		}
@@ -114,7 +114,7 @@ func NewFromFile(path string) (policyList, error) {
 	return pl, nil
 }
 
-func matches(p api.Policy, a authorizer.Attributes) bool {
+func matches(p abac.Policy, a authorizer.Attributes) bool {
 	if subjectMatches(p, a.GetUser()) {
 		if verbMatches(p, a) {
 			// Resource and non-resource requests are mutually exclusive, at most one will match a policy
@@ -130,7 +130,7 @@ func matches(p api.Policy, a authorizer.Attributes) bool {
 }
 
 // subjectMatches returns true if specified user and group properties in the policy match the attributes
-func subjectMatches(p api.Policy, user user.Info) bool {
+func subjectMatches(p abac.Policy, user user.Info) bool {
 	matched := false
 
 	if user == nil {
@@ -171,7 +171,7 @@ func subjectMatches(p api.Policy, user user.Info) bool {
 	return matched
 }
 
-func verbMatches(p api.Policy, a authorizer.Attributes) bool {
+func verbMatches(p abac.Policy, a authorizer.Attributes) bool {
 	// TODO: match on verb
 
 	// All policies allow read only requests
@@ -187,7 +187,7 @@ func verbMatches(p api.Policy, a authorizer.Attributes) bool {
 	return false
 }
 
-func nonResourceMatches(p api.Policy, a authorizer.Attributes) bool {
+func nonResourceMatches(p abac.Policy, a authorizer.Attributes) bool {
 	// A non-resource policy cannot match a resource request
 	if !a.IsResourceRequest() {
 		// Allow wildcard match
@@ -206,7 +206,7 @@ func nonResourceMatches(p api.Policy, a authorizer.Attributes) bool {
 	return false
 }
 
-func resourceMatches(p api.Policy, a authorizer.Attributes) bool {
+func resourceMatches(p abac.Policy, a authorizer.Attributes) bool {
 	// A resource policy cannot match a non-resource request
 	if a.IsResourceRequest() {
 		if p.Spec.Namespace == "*" || p.Spec.Namespace == a.GetNamespace() {
diff --git a/pkg/auth/authorizer/abac/abac_test.go b/pkg/auth/authorizer/abac/abac_test.go
index b8df86bb806..027943a8a3c 100644
--- a/pkg/auth/authorizer/abac/abac_test.go
+++ b/pkg/auth/authorizer/abac/abac_test.go
@@ -25,7 +25,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apiserver/pkg/authentication/user"
 	"k8s.io/apiserver/pkg/authorization/authorizer"
-	api "k8s.io/kubernetes/pkg/apis/abac"
+	"k8s.io/kubernetes/pkg/apis/abac"
 	"k8s.io/kubernetes/pkg/apis/abac/v0"
 	"k8s.io/kubernetes/pkg/apis/abac/v1beta1"
 )
@@ -799,8 +799,8 @@ func TestSubjectMatches(t *testing.T) {
 	}
 
 	for k, tc := range testCases {
-		policy := &api.Policy{}
-		if err := api.Scheme.Convert(tc.Policy, policy, nil); err != nil {
+		policy := &abac.Policy{}
+		if err := abac.Scheme.Convert(tc.Policy, policy, nil); err != nil {
 			t.Errorf("%s: error converting: %v", k, err)
 			continue
 		}
@@ -1254,8 +1254,8 @@ func TestPolicy(t *testing.T) {
 		},
 	}
 	for _, test := range tests {
-		policy := &api.Policy{}
-		if err := api.Scheme.Convert(test.policy, policy, nil); err != nil {
+		policy := &abac.Policy{}
+		if err := abac.Scheme.Convert(test.policy, policy, nil); err != nil {
 			t.Errorf("%s: error converting: %v", test.name, err)
 			continue
 		}
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/plugin/pkg/scheduler/api/latest/latest.go b/plugin/pkg/scheduler/api/latest/latest.go
index cef40b6acb1..f225847737a 100644
--- a/plugin/pkg/scheduler/api/latest/latest.go
+++ b/plugin/pkg/scheduler/api/latest/latest.go
@@ -21,7 +21,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/runtime/serializer/json"
 	"k8s.io/apimachinery/pkg/runtime/serializer/versioning"
-	"k8s.io/kubernetes/plugin/pkg/scheduler/api"
+	schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api"
 	_ "k8s.io/kubernetes/plugin/pkg/scheduler/api/v1"
 )
 
@@ -42,9 +42,9 @@ var Versions = []string{"v1"}
 var Codec runtime.Codec
 
 func init() {
-	jsonSerializer := json.NewSerializer(json.DefaultMetaFactory, api.Scheme, api.Scheme, true)
+	jsonSerializer := json.NewSerializer(json.DefaultMetaFactory, schedulerapi.Scheme, schedulerapi.Scheme, true)
 	Codec = versioning.NewDefaultingCodecForScheme(
-		api.Scheme,
+		schedulerapi.Scheme,
 		jsonSerializer,
 		jsonSerializer,
 		schema.GroupVersion{Version: Version},
diff --git a/plugin/pkg/scheduler/api/v1/register.go b/plugin/pkg/scheduler/api/v1/register.go
index 406c2e03f57..292245a0a61 100644
--- a/plugin/pkg/scheduler/api/v1/register.go
+++ b/plugin/pkg/scheduler/api/v1/register.go
@@ -19,7 +19,7 @@ package v1
 import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/kubernetes/plugin/pkg/scheduler/api"
+	schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api"
 )
 
 // SchemeGroupVersion is group version used to register these objects
@@ -27,7 +27,7 @@ import (
 var SchemeGroupVersion = schema.GroupVersion{Group: "", Version: "v1"}
 
 func init() {
-	if err := addKnownTypes(api.Scheme); err != nil {
+	if err := addKnownTypes(schedulerapi.Scheme); err != nil {
 		// Programmer error.
 		panic(err)
 	}
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{},