diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go
index 8370ddeaae3..c48cdf0d31f 100644
--- a/cmd/kubeadm/app/constants/constants.go
+++ b/cmd/kubeadm/app/constants/constants.go
@@ -203,7 +203,7 @@ const (
 	CertificateKeySize = 32
 
 	// LabelNodeRoleMaster specifies that a node is a control-plane
-	// This is a duplicate definition of the constant in pkg/controller/service/service_controller.go
+	// This is a duplicate definition of the constant in pkg/controller/service/controller.go
 	LabelNodeRoleMaster = "node-role.kubernetes.io/master"
 
 	// AnnotationKubeadmCRISocket specifies the annotation kubeadm uses to preserve the crisocket information given to kubeadm at
diff --git a/pkg/controller/service/BUILD b/pkg/controller/service/BUILD
index 9355be1432e..bf6941e0eb0 100644
--- a/pkg/controller/service/BUILD
+++ b/pkg/controller/service/BUILD
@@ -3,9 +3,9 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 go_library(
     name = "go_default_library",
     srcs = [
+        "controller.go",
         "doc.go",
         "patch.go",
-        "service_controller.go",
     ],
     importpath = "k8s.io/kubernetes/pkg/controller/service",
     visibility = ["//visibility:public"],
@@ -36,8 +36,8 @@ go_library(
 go_test(
     name = "go_default_test",
     srcs = [
+        "controller_test.go",
         "patch_test.go",
-        "service_controller_test.go",
     ],
     embed = [":go_default_library"],
     deps = [
diff --git a/pkg/controller/service/service_controller.go b/pkg/controller/service/controller.go
similarity index 100%
rename from pkg/controller/service/service_controller.go
rename to pkg/controller/service/controller.go
diff --git a/pkg/controller/service/service_controller_test.go b/pkg/controller/service/controller_test.go
similarity index 100%
rename from pkg/controller/service/service_controller_test.go
rename to pkg/controller/service/controller_test.go
diff --git a/test/e2e/framework/node/wait_test.go b/test/e2e/framework/node/wait_test.go
index f039017a049..050c4661143 100644
--- a/test/e2e/framework/node/wait_test.go
+++ b/test/e2e/framework/node/wait_test.go
@@ -31,7 +31,7 @@ import (
 // TestCheckReadyForTests specifically is concerned about the multi-node logic
 // since single node checks are in TestReadyForTests.
 func TestCheckReadyForTests(t *testing.T) {
-	// This is a duplicate definition of the constant in pkg/controller/service/service_controller.go
+	// This is a duplicate definition of the constant in pkg/controller/service/controller.go
 	labelNodeRoleMaster := "node-role.kubernetes.io/master"
 
 	fromVanillaNode := func(f func(*v1.Node)) v1.Node {