diff --git a/pkg/controlplane/BUILD b/pkg/controlplane/BUILD
index 0bb1de76813..531ff6dcb6c 100644
--- a/pkg/controlplane/BUILD
+++ b/pkg/controlplane/BUILD
@@ -7,7 +7,7 @@ go_library(
         "controller.go",
         "doc.go",
         "import_known_versions.go",
-        "master.go",
+        "instance.go",
         "services.go",
     ],
     importpath = "k8s.io/kubernetes/pkg/controlplane",
@@ -142,8 +142,8 @@ go_test(
     srcs = [
         "controller_test.go",
         "import_known_versions_test.go",
-        "master_openapi_test.go",
-        "master_test.go",
+        "instance_openapi_test.go",
+        "instance_test.go",
     ],
     embed = [":go_default_library"],
     race = "off",
diff --git a/pkg/controlplane/master.go b/pkg/controlplane/instance.go
similarity index 100%
rename from pkg/controlplane/master.go
rename to pkg/controlplane/instance.go
diff --git a/pkg/controlplane/master_openapi_test.go b/pkg/controlplane/instance_openapi_test.go
similarity index 100%
rename from pkg/controlplane/master_openapi_test.go
rename to pkg/controlplane/instance_openapi_test.go
diff --git a/pkg/controlplane/master_test.go b/pkg/controlplane/instance_test.go
similarity index 100%
rename from pkg/controlplane/master_test.go
rename to pkg/controlplane/instance_test.go
diff --git a/pkg/controlplane/reconcilers/BUILD b/pkg/controlplane/reconcilers/BUILD
index ff2834f4499..55146b8b1fb 100644
--- a/pkg/controlplane/reconcilers/BUILD
+++ b/pkg/controlplane/reconcilers/BUILD
@@ -5,8 +5,8 @@ go_library(
     srcs = [
         "doc.go",
         "endpointsadapter.go",
+        "instancecount.go",
         "lease.go",
-        "mastercount.go",
         "none.go",
         "reconcilers.go",
     ],
diff --git a/pkg/controlplane/reconcilers/mastercount.go b/pkg/controlplane/reconcilers/instancecount.go
similarity index 100%
rename from pkg/controlplane/reconcilers/mastercount.go
rename to pkg/controlplane/reconcilers/instancecount.go