diff --git a/hack/.golint_failures b/hack/.golint_failures
index de0afe584e..9c138bef30 100644
--- a/hack/.golint_failures
+++ b/hack/.golint_failures
@@ -171,7 +171,6 @@ pkg/kubelet/dockershim/network/testing
 pkg/kubelet/events
 pkg/kubelet/lifecycle
 pkg/kubelet/metrics
-pkg/kubelet/oom
 pkg/kubelet/pod/testing
 pkg/kubelet/preemption
 pkg/kubelet/prober
diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go
index 12d812cb38..2ac874cf39 100644
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -32,7 +32,7 @@ import (
 	"time"
 
 	cadvisorapi "github.com/google/cadvisor/info/v1"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/apimachinery/pkg/labels"
@@ -465,7 +465,7 @@ func NewMainKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration,
 
 	containerRefManager := kubecontainer.NewRefManager()
 
-	oomWatcher := oomwatcher.NewOOMWatcher(kubeDeps.Recorder)
+	oomWatcher := oomwatcher.NewWatcher(kubeDeps.Recorder)
 
 	clusterDNS := make([]net.IP, 0, len(kubeCfg.ClusterDNS))
 	for _, ipEntry := range kubeCfg.ClusterDNS {
@@ -1079,7 +1079,7 @@ type Kubelet struct {
 	os kubecontainer.OSInterface
 
 	// Watcher of out of memory events.
-	oomWatcher oomwatcher.OOMWatcher
+	oomWatcher oomwatcher.Watcher
 
 	// Monitor resource usage
 	resourceAnalyzer serverstats.ResourceAnalyzer
diff --git a/pkg/kubelet/oom/oom_watcher_linux.go b/pkg/kubelet/oom/oom_watcher_linux.go
index 77c75bf65c..82984d2390 100644
--- a/pkg/kubelet/oom/oom_watcher_linux.go
+++ b/pkg/kubelet/oom/oom_watcher_linux.go
@@ -19,7 +19,7 @@ limitations under the License.
 package oom
 
 import (
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/client-go/tools/record"
@@ -28,23 +28,23 @@ import (
 	"github.com/google/cadvisor/utils/oomparser"
 )
 
-type realOOMWatcher struct {
+type realWatcher struct {
 	recorder record.EventRecorder
 }
 
-var _ OOMWatcher = &realOOMWatcher{}
+var _ Watcher = &realWatcher{}
 
-// NewOOMWatcher creates and initializes a OOMWatcher based on parameters.
-func NewOOMWatcher(recorder record.EventRecorder) OOMWatcher {
-	return &realOOMWatcher{
+// NewWatcher creates and initializes a OOMWatcher based on parameters.
+func NewWatcher(recorder record.EventRecorder) Watcher {
+	return &realWatcher{
 		recorder: recorder,
 	}
 }
 
 const systemOOMEvent = "SystemOOM"
 
-// Watches for system oom's and records an event for every system oom encountered.
-func (ow *realOOMWatcher) Start(ref *v1.ObjectReference) error {
+// Start watches for system oom's and records an event for every system oom encountered.
+func (ow *realWatcher) Start(ref *v1.ObjectReference) error {
 	oomLog, err := oomparser.New()
 	if err != nil {
 		return err
diff --git a/pkg/kubelet/oom/oom_watcher_linux_test.go b/pkg/kubelet/oom/oom_watcher_linux_test.go
index 5aba6e4142..0a09a2fd84 100644
--- a/pkg/kubelet/oom/oom_watcher_linux_test.go
+++ b/pkg/kubelet/oom/oom_watcher_linux_test.go
@@ -21,14 +21,15 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/tools/record"
 )
 
+// TestBasic verifies that the OOMWatch works without error.
 func TestBasic(t *testing.T) {
 	fakeRecorder := &record.FakeRecorder{}
 	node := &v1.ObjectReference{}
-	oomWatcher := NewOOMWatcher(fakeRecorder)
+	oomWatcher := NewWatcher(fakeRecorder)
 	assert.NoError(t, oomWatcher.Start(node))
 
 	// TODO: Improve this test once cadvisor exports events.EventChannel as an interface
diff --git a/pkg/kubelet/oom/oom_watcher_unsupported.go b/pkg/kubelet/oom/oom_watcher_unsupported.go
index b7f1530b17..a18b19d7af 100644
--- a/pkg/kubelet/oom/oom_watcher_unsupported.go
+++ b/pkg/kubelet/oom/oom_watcher_unsupported.go
@@ -19,16 +19,16 @@ limitations under the License.
 package oom
 
 import (
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/tools/record"
 )
 
 type oomWatcherUnsupported struct{}
 
-var _ OOMWatcher = new(oomWatcherUnsupported)
+var _ Watcher = new(oomWatcherUnsupported)
 
-// NewOOMWatcher creates a fake one here
-func NewOOMWatcher(_ record.EventRecorder) OOMWatcher {
+// NewWatcher creates a fake one here
+func NewWatcher(_ record.EventRecorder) Watcher {
 	return &oomWatcherUnsupported{}
 }
 
diff --git a/pkg/kubelet/oom/types.go b/pkg/kubelet/oom/types.go
index 09d50b181d..ca9dd8b17a 100644
--- a/pkg/kubelet/oom/types.go
+++ b/pkg/kubelet/oom/types.go
@@ -16,11 +16,9 @@ limitations under the License.
 
 package oom
 
-import (
-	"k8s.io/api/core/v1"
-)
+import v1 "k8s.io/api/core/v1"
 
-// OOMWatcher defines the interface of OOM watchers.
-type OOMWatcher interface {
+// Watcher defines the interface of OOM watchers.
+type Watcher interface {
 	Start(ref *v1.ObjectReference) error
 }