diff --git a/test/integration/defaulttolerationseconds/defaulttolerationseconds_test.go b/test/integration/defaulttolerationseconds/defaulttolerationseconds_test.go
index 0fb11eb770a..1bfa4d89560 100644
--- a/test/integration/defaulttolerationseconds/defaulttolerationseconds_test.go
+++ b/test/integration/defaulttolerationseconds/defaulttolerationseconds_test.go
@@ -31,7 +31,7 @@ import (
 )
 
 func TestAdmission(t *testing.T) {
-	masterConfig := framework.NewMasterConfig()
+	masterConfig := framework.NewControlPlaneConfig()
 	masterConfig.GenericConfig.EnableProfiling = true
 	masterConfig.GenericConfig.AdmissionControl = defaulttolerationseconds.NewDefaultTolerationSeconds()
 	_, s, closeFn := framework.RunAMaster(masterConfig)
diff --git a/test/integration/framework/master_utils.go b/test/integration/framework/master_utils.go
index 86b6148f4d9..552c84d8c4e 100644
--- a/test/integration/framework/master_utils.go
+++ b/test/integration/framework/master_utils.go
@@ -153,7 +153,7 @@ func startApiserverOrDie(controlPlaneConfig *controlplane.Config, incomingServer
 	}
 
 	if controlPlaneConfig == nil {
-		controlPlaneConfig = NewMasterConfig()
+		controlPlaneConfig = NewControlPlaneConfig()
 		controlPlaneConfig.GenericConfig.OpenAPIConfig = DefaultOpenAPIConfig()
 	}
 
@@ -256,10 +256,10 @@ func NewIntegrationTestControlPlaneConfig() *controlplane.Config {
 	return NewIntegrationTestControlPlaneConfigWithOptions(&MasterConfigOptions{})
 }
 
-// NewIntegrationTestControlPlaneConfigWithOptions returns the master config appropriate for most integration tests
+// NewIntegrationTestControlPlaneConfigWithOptions returns the control plane config appropriate for most integration tests
 // configured with the provided options.
 func NewIntegrationTestControlPlaneConfigWithOptions(opts *MasterConfigOptions) *controlplane.Config {
-	masterConfig := NewMasterConfigWithOptions(opts)
+	masterConfig := NewControlPlaneConfigWithOptions(opts)
 	masterConfig.GenericConfig.PublicAddress = net.ParseIP("192.168.10.4")
 	masterConfig.ExtraConfig.APIResourceConfigSource = controlplane.DefaultAPIResourceConfigSource()
 
@@ -284,13 +284,13 @@ func DefaultEtcdOptions() *options.EtcdOptions {
 	return etcdOptions
 }
 
-// NewMasterConfig returns a basic master config.
-func NewMasterConfig() *controlplane.Config {
-	return NewMasterConfigWithOptions(&MasterConfigOptions{})
+// NewControlPlaneConfig returns a basic control plane config.
+func NewControlPlaneConfig() *controlplane.Config {
+	return NewControlPlaneConfigWithOptions(&MasterConfigOptions{})
 }
 
-// NewMasterConfigWithOptions returns a basic master config configured with the provided options.
-func NewMasterConfigWithOptions(opts *MasterConfigOptions) *controlplane.Config {
+// NewControlPlaneConfigWithOptions returns a basic control plane config configured with the provided options.
+func NewControlPlaneConfigWithOptions(opts *MasterConfigOptions) *controlplane.Config {
 	etcdOptions := DefaultEtcdOptions()
 	if opts.EtcdOptions != nil {
 		etcdOptions = opts.EtcdOptions
@@ -344,7 +344,7 @@ type CloseFunc func()
 // RunAMaster starts a master with the provided config.
 func RunAMaster(masterConfig *controlplane.Config) (*controlplane.Instance, *httptest.Server, CloseFunc) {
 	if masterConfig == nil {
-		masterConfig = NewMasterConfig()
+		masterConfig = NewControlPlaneConfig()
 		masterConfig.GenericConfig.EnableProfiling = true
 	}
 	return startApiserverOrDie(masterConfig, nil, nil)
diff --git a/test/integration/master/synthetic_master_test.go b/test/integration/master/synthetic_master_test.go
index 970adff6aa7..5004b8a8695 100644
--- a/test/integration/master/synthetic_master_test.go
+++ b/test/integration/master/synthetic_master_test.go
@@ -94,7 +94,7 @@ func TestAppsPrefix(t *testing.T) {
 }
 
 func TestKubernetesService(t *testing.T) {
-	config := framework.NewMasterConfig()
+	config := framework.NewControlPlaneConfig()
 	_, _, closeFn := framework.RunAMaster(config)
 	defer closeFn()
 	coreClient := clientset.NewForConfigOrDie(config.GenericConfig.LoopbackClientConfig)
diff --git a/test/integration/metrics/metrics_test.go b/test/integration/metrics/metrics_test.go
index bf0845e27e7..8731140d379 100644
--- a/test/integration/metrics/metrics_test.go
+++ b/test/integration/metrics/metrics_test.go
@@ -266,7 +266,7 @@ func TestApiserverMetricsPods(t *testing.T) {
 		}
 	}
 
-	_, server, closeFn := framework.RunAMaster(framework.NewMasterConfig())
+	_, server, closeFn := framework.RunAMaster(framework.NewControlPlaneConfig())
 	defer closeFn()
 
 	client, err := clientset.NewForConfig(&restclient.Config{Host: server.URL, QPS: -1})
@@ -372,7 +372,7 @@ func TestApiserverMetricsNamespaces(t *testing.T) {
 		}
 	}
 
-	_, server, closeFn := framework.RunAMaster(framework.NewMasterConfig())
+	_, server, closeFn := framework.RunAMaster(framework.NewControlPlaneConfig())
 	defer closeFn()
 
 	client, err := clientset.NewForConfig(&restclient.Config{Host: server.URL, QPS: -1})
diff --git a/test/integration/objectmeta/objectmeta_test.go b/test/integration/objectmeta/objectmeta_test.go
index bd98f464325..ce78555fb55 100644
--- a/test/integration/objectmeta/objectmeta_test.go
+++ b/test/integration/objectmeta/objectmeta_test.go
@@ -31,7 +31,7 @@ import (
 )
 
 func TestIgnoreClusterName(t *testing.T) {
-	config := framework.NewMasterConfig()
+	config := framework.NewControlPlaneConfig()
 	_, s, closeFn := framework.RunAMaster(config)
 	defer closeFn()
 
diff --git a/test/integration/serviceaccount/service_account_test.go b/test/integration/serviceaccount/service_account_test.go
index 08d5d3bebb3..c18263ed22d 100644
--- a/test/integration/serviceaccount/service_account_test.go
+++ b/test/integration/serviceaccount/service_account_test.go
@@ -400,7 +400,7 @@ func startServiceAccountTestServer(t *testing.T) (*clientset.Clientset, restclie
 	serviceAccountAdmission.SetExternalKubeClientSet(externalRootClientset)
 	serviceAccountAdmission.SetExternalKubeInformerFactory(externalInformers)
 
-	masterConfig := framework.NewMasterConfig()
+	masterConfig := framework.NewControlPlaneConfig()
 	masterConfig.GenericConfig.EnableIndex = true
 	masterConfig.GenericConfig.Authentication.Authenticator = authenticator
 	masterConfig.GenericConfig.Authorization.Authorizer = authorizer