diff --git a/hack/.golint_failures b/hack/.golint_failures
index 36e4a37e05..5ac9cb163a 100644
--- a/hack/.golint_failures
+++ b/hack/.golint_failures
@@ -366,20 +366,17 @@ pkg/volume/util/recyclerclient
 pkg/volume/util/volumepathhandler
 pkg/volume/vsphere_volume
 plugin/pkg/admission/antiaffinity
-plugin/pkg/admission/eventratelimit/apis/eventratelimit
 plugin/pkg/admission/eventratelimit/apis/eventratelimit/v1alpha1
 plugin/pkg/admission/limitranger
 plugin/pkg/admission/noderestriction
 plugin/pkg/admission/podnodeselector
 plugin/pkg/admission/podpreset
 plugin/pkg/admission/podtolerationrestriction
-plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction
 plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction/v1alpha1
 plugin/pkg/admission/resourcequota
 plugin/pkg/admission/resourcequota/apis/resourcequota
 plugin/pkg/admission/resourcequota/apis/resourcequota/v1alpha1
 plugin/pkg/admission/resourcequota/apis/resourcequota/v1beta1
-plugin/pkg/admission/security
 plugin/pkg/admission/security/podsecuritypolicy
 plugin/pkg/admission/serviceaccount
 plugin/pkg/auth/authorizer/node
diff --git a/plugin/pkg/admission/eventratelimit/apis/eventratelimit/register.go b/plugin/pkg/admission/eventratelimit/apis/eventratelimit/register.go
index d763c55cb2..c9f2ca8ec7 100644
--- a/plugin/pkg/admission/eventratelimit/apis/eventratelimit/register.go
+++ b/plugin/pkg/admission/eventratelimit/apis/eventratelimit/register.go
@@ -22,8 +22,10 @@ import (
 )
 
 var (
+	// SchemeBuilder is the scheme builder with scheme init functions to run for this API package
 	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
-	AddToScheme   = SchemeBuilder.AddToScheme
+	// AddToScheme is a global function that registers this API group & version to a scheme
+	AddToScheme = SchemeBuilder.AddToScheme
 )
 
 // GroupName is the group name use in this package
diff --git a/plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction/register.go b/plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction/register.go
index 2dc917b0ff..db676791fd 100644
--- a/plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction/register.go
+++ b/plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction/register.go
@@ -28,8 +28,10 @@ const GroupName = "podtolerationrestriction.admission.k8s.io"
 var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: runtime.APIVersionInternal}
 
 var (
+	// SchemeBuilder is the scheme builder with scheme init functions to run for this API package
 	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
-	AddToScheme   = SchemeBuilder.AddToScheme
+	// AddToScheme is a global function that registers this API group & version to a scheme
+	AddToScheme = SchemeBuilder.AddToScheme
 )
 
 // Kind takes an unqualified kind and returns a Group qualified GroupKind
diff --git a/plugin/pkg/admission/security/doc.go b/plugin/pkg/admission/security/doc.go
index 4177e557c4..c0fe55269a 100644
--- a/plugin/pkg/admission/security/doc.go
+++ b/plugin/pkg/admission/security/doc.go
@@ -14,5 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// security contains admission plugins specific to cluster security.
+// Package security contains admission plugins specific to cluster security.
 package security // import "k8s.io/kubernetes/plugin/pkg/admission/security"