diff --git a/terraform/graph_builder_plan.go b/terraform/graph_builder_plan.go
index eb5d3a437..9c3ffed84 100644
--- a/terraform/graph_builder_plan.go
+++ b/terraform/graph_builder_plan.go
@@ -152,7 +152,7 @@ func (b *PlanGraphBuilder) Steps() []GraphTransformer {
 
 		// Make sure data sources are aware of any depends_on from the
 		// configuration
-		&AttachDependsOnTransformer{},
+		&attachDataResourceDependenciesTransformer{},
 
 		// Add the node to fix the state count boundaries
 		&CountBoundaryTransformer{
diff --git a/terraform/node_resource_abstract.go b/terraform/node_resource_abstract.go
index 4614daf45..2945dbedf 100644
--- a/terraform/node_resource_abstract.go
+++ b/terraform/node_resource_abstract.go
@@ -69,18 +69,18 @@ type NodeAbstractResource struct {
 }
 
 var (
-	_ GraphNodeReferenceable             = (*NodeAbstractResource)(nil)
-	_ GraphNodeReferencer                = (*NodeAbstractResource)(nil)
-	_ GraphNodeProviderConsumer          = (*NodeAbstractResource)(nil)
-	_ GraphNodeProvisionerConsumer       = (*NodeAbstractResource)(nil)
-	_ GraphNodeConfigResource            = (*NodeAbstractResource)(nil)
-	_ GraphNodeAttachResourceConfig      = (*NodeAbstractResource)(nil)
-	_ GraphNodeAttachResourceSchema      = (*NodeAbstractResource)(nil)
-	_ GraphNodeAttachProvisionerSchema   = (*NodeAbstractResource)(nil)
-	_ GraphNodeAttachProviderMetaConfigs = (*NodeAbstractResource)(nil)
-	_ GraphNodeTargetable                = (*NodeAbstractResource)(nil)
-	_ GraphNodeAttachDependsOn           = (*NodeAbstractResource)(nil)
-	_ dag.GraphNodeDotter                = (*NodeAbstractResource)(nil)
+	_ GraphNodeReferenceable              = (*NodeAbstractResource)(nil)
+	_ GraphNodeReferencer                 = (*NodeAbstractResource)(nil)
+	_ GraphNodeProviderConsumer           = (*NodeAbstractResource)(nil)
+	_ GraphNodeProvisionerConsumer        = (*NodeAbstractResource)(nil)
+	_ GraphNodeConfigResource             = (*NodeAbstractResource)(nil)
+	_ GraphNodeAttachResourceConfig       = (*NodeAbstractResource)(nil)
+	_ GraphNodeAttachResourceSchema       = (*NodeAbstractResource)(nil)
+	_ GraphNodeAttachProvisionerSchema    = (*NodeAbstractResource)(nil)
+	_ GraphNodeAttachProviderMetaConfigs  = (*NodeAbstractResource)(nil)
+	_ GraphNodeTargetable                 = (*NodeAbstractResource)(nil)
+	_ graphNodeAttachResourceDependencies = (*NodeAbstractResource)(nil)
+	_ dag.GraphNodeDotter                 = (*NodeAbstractResource)(nil)
 )
 
 // NewNodeAbstractResource creates an abstract resource graph node for
@@ -396,8 +396,8 @@ func (n *NodeAbstractResource) SetTargets(targets []addrs.Targetable) {
 	n.Targets = targets
 }
 
-// GraphNodeAttachDependsOn
-func (n *NodeAbstractResource) AttachDependsOn(deps []addrs.ConfigResource) {
+// graphNodeAttachResourceDependencies
+func (n *NodeAbstractResource) AttachResourceDependencies(deps []addrs.ConfigResource) {
 	n.dependsOn = deps
 }
 
diff --git a/terraform/transform_reference.go b/terraform/transform_reference.go
index 5280c67d2..13f02b818 100644
--- a/terraform/transform_reference.go
+++ b/terraform/transform_reference.go
@@ -43,7 +43,7 @@ type GraphNodeAttachDependencies interface {
 	AttachDependencies([]addrs.ConfigResource)
 }
 
-// GraphNodeAttachDependsOn records all resources that are transitively
+// graphNodeAttachResourceDependencies records all resources that are transitively
 // referenced through depends_on in the configuration. This is used by data
 // resources to determine if they can be read during the plan, or if they need
 // to be further delayed until apply.
@@ -53,9 +53,9 @@ type GraphNodeAttachDependencies interface {
 // unrelated module instances, the fact that it only happens when there are any
 // resource updates pending means we can still avoid the problem of the
 // "perpetual diff"
-type GraphNodeAttachDependsOn interface {
+type graphNodeAttachResourceDependencies interface {
 	GraphNodeConfigResource
-	AttachDependsOn([]addrs.ConfigResource)
+	AttachResourceDependencies([]addrs.ConfigResource)
 	DependsOn() []*addrs.Reference
 }
 
@@ -138,12 +138,12 @@ func (m depMap) add(v dag.Vertex) {
 	}
 }
 
-// AttachDependsOnTransformer records all resources transitively referenced
+// attachDataResourceDependenciesTransformer records all resources transitively referenced
 // through a configuration depends_on.
-type AttachDependsOnTransformer struct {
+type attachDataResourceDependenciesTransformer struct {
 }
 
-func (t AttachDependsOnTransformer) Transform(g *Graph) error {
+func (t attachDataResourceDependenciesTransformer) Transform(g *Graph) error {
 	// First we need to make a map of referenceable addresses to their vertices.
 	// This is very similar to what's done in ReferenceTransformer, but we keep
 	// implementation separate as they may need to change independently.
@@ -151,7 +151,7 @@ func (t AttachDependsOnTransformer) Transform(g *Graph) error {
 	refMap := NewReferenceMap(vertices)
 
 	for _, v := range vertices {
-		depender, ok := v.(GraphNodeAttachDependsOn)
+		depender, ok := v.(graphNodeAttachResourceDependencies)
 		if !ok {
 			continue
 		}
@@ -182,7 +182,7 @@ func (t AttachDependsOnTransformer) Transform(g *Graph) error {
 		}
 
 		log.Printf("[TRACE] AttachDependsOnTransformer: %s depends on %s", depender.ResourceAddr(), deps)
-		depender.AttachDependsOn(deps)
+		depender.AttachResourceDependencies(deps)
 	}
 
 	return nil
@@ -357,7 +357,7 @@ func (m ReferenceMap) References(v dag.Vertex) []dag.Vertex {
 // DependsOn returns the set of vertices that the given vertex refers to from
 // the configured depends_on.
 func (m ReferenceMap) DependsOn(v dag.Vertex) []dag.Vertex {
-	depender, ok := v.(GraphNodeAttachDependsOn)
+	depender, ok := v.(graphNodeAttachResourceDependencies)
 	if !ok {
 		return nil
 	}