remove "prepare state" from expanders

That name tag was left in only to reduce the diff when during
implementation. Fix the naming now for these nodes so it is correct, and
prevent any possible name collision between types.

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()
 }

terraform/node_local.go

@@ -36,7 +36,7 @@ func (n *NodePlannableLocal) Name() string {
 	if path != "" {
 		return path + "." + addr
 	}
-	return addr
+	return addr + " (expand)"
 }
 
 // GraphNodeModulePath

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

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

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) {

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 {

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