diff --git a/ec/acc/datasource_deployment_basic_test.go b/ec/acc/datasource_deployment_basic_test.go
index 797c54341..16a10dc6e 100644
--- a/ec/acc/datasource_deployment_basic_test.go
+++ b/ec/acc/datasource_deployment_basic_test.go
@@ -31,7 +31,7 @@ func TestAccDatasourceDeployment_basic(t *testing.T) {
 	datasourceName := "data.ec_deployment.success"
 	depsDatasourceName := "data.ec_deployments.query"
 	randomName := prefix + acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum)
-	secondRandomName := prefix + acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum)
+	secondRandomName := prefix + "-" + acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum)
 	depCfg := "testdata/datasource_deployment_basic.tf"
 	cfg := fixtureAccDeploymentDatasourceBasic(t, depCfg, randomName, secondRandomName, getRegion(), computeOpTemplate)
 	var namePrefix = secondRandomName[:22]
@@ -56,14 +56,14 @@ func TestAccDatasourceDeployment_basic(t *testing.T) {
 					resource.TestCheckResourceAttrPair(datasourceName, "elasticsearch.0.http_endpoint_id", resourceName, "elasticsearch.0.http_endpoint_id"),
 					resource.TestCheckResourceAttrPair(datasourceName, "elasticsearch.0.https_endpoint_id", resourceName, "elasticsearch.0.https_endpoint_id"),
 					resource.TestCheckResourceAttrPair(datasourceName, "elasticsearch.0.version", resourceName, "elasticsearch.0.version"),
-					resource.TestCheckResourceAttrPair(datasourceName, "elasticsearch.0.topology.0.instance_configuration_id", resourceName, "elasticsearch.0.topology.0.instance_configuration_id"),
-					resource.TestCheckResourceAttrPair(datasourceName, "elasticsearch.0.topology.0.size", resourceName, "elasticsearch.0.topology.0.size"),
-					resource.TestCheckResourceAttrPair(datasourceName, "elasticsearch.0.topology.0.size_resource", resourceName, "elasticsearch.0.topology.0.size_resource"),
-					resource.TestCheckResourceAttrPair(datasourceName, "elasticsearch.0.topology.0.zone_count", resourceName, "elasticsearch.0.topology.0.zone_count"),
-					resource.TestCheckResourceAttrPair(datasourceName, "elasticsearch.0.topology.0.node_type_data", resourceName, "elasticsearch.0.topology.0.node_type_data"),
-					resource.TestCheckResourceAttrPair(datasourceName, "elasticsearch.0.topology.0.node_type_master", resourceName, "elasticsearch.0.topology.0.node_type_master"),
-					resource.TestCheckResourceAttrPair(datasourceName, "elasticsearch.0.topology.0.node_type_ingest", resourceName, "elasticsearch.0.topology.0.node_type_ingest"),
-					resource.TestCheckResourceAttrPair(datasourceName, "elasticsearch.0.topology.0.node_type_ml", resourceName, "elasticsearch.0.topology.0.node_type_ml"),
+					resource.TestCheckResourceAttrPair(datasourceName, "elasticsearch.0.topology.1.instance_configuration_id", resourceName, "elasticsearch.0.topology.0.instance_configuration_id"),
+					resource.TestCheckResourceAttrPair(datasourceName, "elasticsearch.0.topology.1.size", resourceName, "elasticsearch.0.topology.0.size"),
+					resource.TestCheckResourceAttrPair(datasourceName, "elasticsearch.0.topology.1.size_resource", resourceName, "elasticsearch.0.topology.0.size_resource"),
+					resource.TestCheckResourceAttrPair(datasourceName, "elasticsearch.0.topology.1.zone_count", resourceName, "elasticsearch.0.topology.0.zone_count"),
+					resource.TestCheckResourceAttrPair(datasourceName, "elasticsearch.0.topology.1.node_type_data", resourceName, "elasticsearch.0.topology.0.node_type_data"),
+					resource.TestCheckResourceAttrPair(datasourceName, "elasticsearch.0.topology.1.node_type_master", resourceName, "elasticsearch.0.topology.0.node_type_master"),
+					resource.TestCheckResourceAttrPair(datasourceName, "elasticsearch.0.topology.1.node_type_ingest", resourceName, "elasticsearch.0.topology.0.node_type_ingest"),
+					resource.TestCheckResourceAttrPair(datasourceName, "elasticsearch.0.topology.1.node_type_ml", resourceName, "elasticsearch.0.topology.0.node_type_ml"),
 
 					// Kibana
 					resource.TestCheckResourceAttrPair(datasourceName, "kibana.0.elasticsearch_cluster_ref_id", resourceName, "kibana.0.elasticsearch_cluster_ref_id"),
diff --git a/ec/acc/testdata/datasource_deployment_basic.tf b/ec/acc/testdata/datasource_deployment_basic.tf
index ac63da680..f21c72407 100644
--- a/ec/acc/testdata/datasource_deployment_basic.tf
+++ b/ec/acc/testdata/datasource_deployment_basic.tf
@@ -25,7 +25,8 @@ resource "ec_deployment" "basic_datasource" {
 
   elasticsearch {
     topology {
-      size = "1g"
+      size       = "1g"
+      zone_count = 1
     }
   }
 
diff --git a/ec/ecdatasource/deploymentsdatasource/expanders.go b/ec/ecdatasource/deploymentsdatasource/expanders.go
index d726dedca..7d3a7e546 100644
--- a/ec/ecdatasource/deploymentsdatasource/expanders.go
+++ b/ec/ecdatasource/deploymentsdatasource/expanders.go
@@ -34,7 +34,9 @@ func expandFilters(d *schema.ResourceData) (*models.SearchRequest, error) {
 	if namePrefix != "" {
 		queries = append(queries, &models.QueryContainer{
 			Prefix: map[string]models.PrefixQuery{
-				"name": {Value: ec.String(namePrefix)},
+				// The "keyword" addition denotes that the query will be using a keyword
+				// field rather than a text field in order to ensure the query is not analyzed
+				"name.keyword": {Value: ec.String(namePrefix)},
 			},
 		})
 	}
diff --git a/ec/ecdatasource/deploymentsdatasource/expanders_test.go b/ec/ecdatasource/deploymentsdatasource/expanders_test.go
index 825a50d3a..6bf2e4322 100644
--- a/ec/ecdatasource/deploymentsdatasource/expanders_test.go
+++ b/ec/ecdatasource/deploymentsdatasource/expanders_test.go
@@ -128,7 +128,7 @@ func newTestQuery() []*models.QueryContainer {
 	return []*models.QueryContainer{
 		{
 			Prefix: map[string]models.PrefixQuery{
-				"name": {Value: ec.String("test")},
+				"name.keyword": {Value: ec.String("test")},
 			},
 		},
 		{