diff --git a/azurerm/data_source_container_orchestrator_versions.go b/azurerm/data_source_container_orchestrator_versions.go
index 2dc0ae0de45f..255372374137 100644
--- a/azurerm/data_source_container_orchestrator_versions.go
+++ b/azurerm/data_source_container_orchestrator_versions.go
@@ -42,7 +42,7 @@ func dataSourceArmKubernetesServiceVersionsRead(d *schema.ResourceData, meta int
 	listResp, err := client.ListOrchestrators(ctx, location, "managedClusters")
 	if err != nil {
 		if utils.ResponseWasNotFound(listResp.Response) {
-			return fmt.Errorf("Error: Container Orchestrators not found for location %q", location)
+			return fmt.Errorf("Error: No Kubernetes Service versions found for location %q", location)
 		}
 		return fmt.Errorf("Error retrieving Kubernetes Versions in %q: %+v", location, err)
 	}
diff --git a/azurerm/data_source_container_orchestrator_versions_test.go b/azurerm/data_source_container_orchestrator_versions_test.go
index 41b7345bebe6..e9b7201a2a53 100644
--- a/azurerm/data_source_container_orchestrator_versions_test.go
+++ b/azurerm/data_source_container_orchestrator_versions_test.go
@@ -10,8 +10,8 @@ import (
 
 const k8sVersionRX = `[0-9]+\.[0-9]+\.[0-9]*`
 
-func TestAccDataSourceAzureRMContainerOrchestratorVersions_basic(t *testing.T) {
-	dataSourceName := "data.azurerm_container_orchestrator_versions.test"
+func TestAccDataSourceAzureRMKubernetesServiceVersions_basic(t *testing.T) {
+	dataSourceName := "data.azurerm_kubernetes_service_versions.test"
 	location := testLocation()
 	kvrx := regexp.MustCompile(k8sVersionRX)
 
@@ -20,7 +20,7 @@ func TestAccDataSourceAzureRMContainerOrchestratorVersions_basic(t *testing.T) {
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccDataSourceAzureRMContainerOrchestratorVersions_basic(location),
+				Config: testAccDataSourceAzureRMKubernetesServiceVersions_basic(location),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet(dataSourceName, "versions.#"),
 					resource.TestMatchResourceAttr(dataSourceName, "versions.0", kvrx),
@@ -32,8 +32,8 @@ func TestAccDataSourceAzureRMContainerOrchestratorVersions_basic(t *testing.T) {
 	})
 }
 
-func TestAccDataSourceAzureRMContainerOrchestratorVersions_filtered(t *testing.T) {
-	dataSourceName := "data.azurerm_container_orchestrator_versions.test"
+func TestAccDataSourceAzureRMKubernetesServiceVersions_filtered(t *testing.T) {
+	dataSourceName := "data.azurerm_kubernetes_service_versions.test"
 	location := testLocation()
 	kvrx := regexp.MustCompile(k8sVersionRX)
 
@@ -42,7 +42,7 @@ func TestAccDataSourceAzureRMContainerOrchestratorVersions_filtered(t *testing.T
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccDataSourceAzureRMContainerOrchestratorVersions_filtered(location),
+				Config: testAccDataSourceAzureRMKubernetesServiceVersions_filtered(location),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet(dataSourceName, "versions.#"),
 					resource.TestMatchResourceAttr(dataSourceName, "versions.0", kvrx),
@@ -54,17 +54,17 @@ func TestAccDataSourceAzureRMContainerOrchestratorVersions_filtered(t *testing.T
 	})
 }
 
-func testAccDataSourceAzureRMContainerOrchestratorVersions_basic(location string) string {
+func testAccDataSourceAzureRMKubernetesServiceVersions_basic(location string) string {
 	return fmt.Sprintf(`
-data "azurerm_container_orchestrator_versions" "test" {
+data "azurerm_kubernetes_service_versions" "test" {
   location = "%s"
 }
 `, location)
 }
 
-func testAccDataSourceAzureRMContainerOrchestratorVersions_filtered(location string) string {
+func testAccDataSourceAzureRMKubernetesServiceVersions_filtered(location string) string {
 	return fmt.Sprintf(`
-data "azurerm_container_orchestrator_versions" "test" {
+data "azurerm_kubernetes_service_versions" "test" {
   location       = "%s"
   version_prefix = "1."
 }
diff --git a/azurerm/provider.go b/azurerm/provider.go
index a27206e14c59..f2699977d430 100644
--- a/azurerm/provider.go
+++ b/azurerm/provider.go
@@ -120,7 +120,7 @@ func Provider() terraform.ResourceProvider {
 			"azurerm_builtin_role_definition":                dataSourceArmBuiltInRoleDefinition(),
 			"azurerm_cdn_profile":                            dataSourceArmCdnProfile(),
 			"azurerm_client_config":                          dataSourceArmClientConfig(),
-			"azurerm_kubernetes_service_versions":        dataSourceArmKubernetesServiceVersions(),
+			"azurerm_kubernetes_service_versions":            dataSourceArmKubernetesServiceVersions(),
 			"azurerm_container_registry":                     dataSourceArmContainerRegistry(),
 			"azurerm_cosmosdb_account":                       dataSourceArmCosmosDBAccount(),
 			"azurerm_data_lake_store":                        dataSourceArmDataLakeStoreAccount(),