diff --git a/terraform/node_data_refresh.go b/terraform/node_data_refresh.go
index 8e1b9d5f05..c3cfdfbdbd 100644
--- a/terraform/node_data_refresh.go
+++ b/terraform/node_data_refresh.go
@@ -22,6 +22,10 @@ var (
 	_ GraphNodeAttachResourceConfig = (*nodeExpandRefreshableDataResource)(nil)
 )
 
+func (n *nodeExpandRefreshableDataResource) Name() string {
+	return n.NodeAbstractResource.Name() + " (expand)"
+}
+
 func (n *nodeExpandRefreshableDataResource) References() []*addrs.Reference {
 	return (&NodeRefreshableManagedResource{NodeAbstractResource: n.NodeAbstractResource}).References()
 }
diff --git a/terraform/node_local.go b/terraform/node_local.go
index 9fdeedd0d8..559951c007 100644
--- a/terraform/node_local.go
+++ b/terraform/node_local.go
@@ -36,7 +36,7 @@ func (n *NodePlannableLocal) Name() string {
 	if path != "" {
 		return path + "." + addr
 	}
-	return addr
+	return addr + " (expand)"
 }
 
 // GraphNodeModulePath
diff --git a/terraform/node_module_expand.go b/terraform/node_module_expand.go
index 91fd6d23a4..0f8a070a33 100644
--- a/terraform/node_module_expand.go
+++ b/terraform/node_module_expand.go
@@ -33,7 +33,7 @@ var (
 )
 
 func (n *nodeExpandModule) Name() string {
-	return n.Addr.String()
+	return n.Addr.String() + " (expand)"
 }
 
 // GraphNodeModulePath implementation
diff --git a/terraform/node_module_variable.go b/terraform/node_module_variable.go
index 62ebb19132..706b22e497 100644
--- a/terraform/node_module_variable.go
+++ b/terraform/node_module_variable.go
@@ -49,7 +49,7 @@ func (n *nodeExpandModuleVariable) DynamicExpand(ctx EvalContext) (*Graph, error
 }
 
 func (n *nodeExpandModuleVariable) Name() string {
-	return fmt.Sprintf("%s.%s", n.Module, n.Addr.String())
+	return fmt.Sprintf("%s.%s (expand)", n.Module, n.Addr.String())
 }
 
 // GraphNodeModulePath
diff --git a/terraform/node_resource_apply.go b/terraform/node_resource_apply.go
index bfbb202613..fc674e6630 100644
--- a/terraform/node_resource_apply.go
+++ b/terraform/node_resource_apply.go
@@ -30,7 +30,7 @@ func (n *nodeExpandApplyableResource) References() []*addrs.Reference {
 }
 
 func (n *nodeExpandApplyableResource) Name() string {
-	return n.NodeAbstractResource.Name() + " (prepare state)"
+	return n.NodeAbstractResource.Name() + " (expand)"
 }
 
 func (n *nodeExpandApplyableResource) DynamicExpand(ctx EvalContext) (*Graph, error) {
diff --git a/terraform/node_resource_plan.go b/terraform/node_resource_plan.go
index 897e0dc63e..482b06c64c 100644
--- a/terraform/node_resource_plan.go
+++ b/terraform/node_resource_plan.go
@@ -31,6 +31,10 @@ var (
 	_ GraphNodeAttachResourceConfig = (*nodeExpandPlannableResource)(nil)
 )
 
+func (n *nodeExpandPlannableResource) Name() string {
+	return n.NodeAbstractResource.Name() + " (expand)"
+}
+
 // GraphNodeDestroyerCBD
 func (n *nodeExpandPlannableResource) CreateBeforeDestroy() bool {
 	if n.ForceCreateBeforeDestroy != nil {
diff --git a/terraform/node_resource_refresh.go b/terraform/node_resource_refresh.go
index 0956bcd884..8151ad3a0e 100644
--- a/terraform/node_resource_refresh.go
+++ b/terraform/node_resource_refresh.go
@@ -36,6 +36,10 @@ var (
 	_ GraphNodeAttachDependencies   = (*nodeExpandRefreshableManagedResource)(nil)
 )
 
+func (n *nodeExpandRefreshableManagedResource) Name() string {
+	return n.NodeAbstractResource.Name() + " (expand)"
+}
+
 // GraphNodeAttachDependencies
 func (n *nodeExpandRefreshableManagedResource) AttachDependencies(deps []addrs.ConfigResource) {
 	n.Dependencies = deps