diff --git a/gen/templates/resource.go.tmpl b/gen/templates/resource.go.tmpl
index fcaa763b9..cb05bddf5 100644
--- a/gen/templates/resource.go.tmpl
+++ b/gen/templates/resource.go.tmpl
@@ -986,6 +986,8 @@ func (r *{{.ResourceClassName}}Resource) ModifyPlan(ctx context.Context, req res
 										{{- else}}
 					{{ .ResourceClassName }}.{{ .Name }} = basetypes.NewStringUnknown()
 										{{- end}}
+									{{- else if and (ne .Name "TDn") (not (isNewNamedClassAttribute $Overwrite))}}
+					{{ .ResourceClassName }}.{{ .Name }} = basetypes.NewStringUnknown()
 									{{- end}}
 								{{- end}}
 				}
@@ -1019,7 +1021,7 @@ func (r *{{.ResourceClassName}}Resource) ModifyPlan(ctx context.Context, req res
 			{{- $NewProperties := getNewChildAttributes (getChildAttributesFromBlocks $ClassName $.LegacyBlocks) .Properties}}
 			var newAttributeValues []{{ .ResourceClassName }}{{$.ResourceClassName}}ResourceModel
 			if stateData != nil {
-				stateData.Deprecated{{.ResourceClassName}}.ElementsAs(ctx, &newAttributeValues, false)
+				stateData.{{.ResourceClassName}}.ElementsAs(ctx, &newAttributeValues, false)
 			}
 			planData.Deprecated{{.ResourceClassName}}.ElementsAs(ctx, &attributeValues, false)
 			for _, attributeValue := range attributeValues {
diff --git a/internal/provider/resource_aci_application_epg.go b/internal/provider/resource_aci_application_epg.go
index 2be4c2d90..ff35dc724 100644
--- a/internal/provider/resource_aci_application_epg.go
+++ b/internal/provider/resource_aci_application_epg.go
@@ -3417,6 +3417,7 @@ func (r *FvAEPgResource) ModifyPlan(ctx context.Context, req resource.ModifyPlan
 					FvRsFcPathAtt.VsanMode = FvRsFcPathAttValue.VsanMode
 				} else {
 					FvRsFcPathAtt.Annotation = planData.Annotation
+					FvRsFcPathAtt.Descr = basetypes.NewStringUnknown()
 					FvRsFcPathAtt.Vsan = basetypes.NewStringUnknown()
 					FvRsFcPathAtt.VsanMode = basetypes.NewStringUnknown()
 				}
@@ -3594,8 +3595,11 @@ func (r *FvAEPgResource) ModifyPlan(ctx context.Context, req resource.ModifyPlan
 					FvRsPathAtt.PrimaryEncap = FvRsPathAttValue.PrimaryEncap
 				} else {
 					FvRsPathAtt.Annotation = planData.Annotation
+					FvRsPathAtt.Descr = basetypes.NewStringUnknown()
+					FvRsPathAtt.Encap = basetypes.NewStringUnknown()
 					FvRsPathAtt.InstrImedcy = basetypes.NewStringUnknown()
 					FvRsPathAtt.Mode = basetypes.NewStringUnknown()
+					FvRsPathAtt.PrimaryEncap = basetypes.NewStringUnknown()
 				}
 				tagAnnotationFvRsPathAttFvAEPgValue, _ := types.SetValueFrom(ctx, TagAnnotationFvRsPathAttFvAEPgType, make([]TagAnnotationFvRsPathAttFvAEPgResourceModel, 0))
 				FvRsPathAtt.TagAnnotation = tagAnnotationFvRsPathAttFvAEPgValue
@@ -3678,7 +3682,7 @@ func (r *FvAEPgResource) ModifyPlan(ctx context.Context, req resource.ModifyPlan
 			var attributeValues []FvRsNodeAttFvAEPgResourceModelV1
 			var newAttributeValues []FvRsNodeAttFvAEPgResourceModel
 			if stateData != nil {
-				stateData.DeprecatedFvRsNodeAtt.ElementsAs(ctx, &newAttributeValues, false)
+				stateData.FvRsNodeAtt.ElementsAs(ctx, &newAttributeValues, false)
 			}
 			planData.DeprecatedFvRsNodeAtt.ElementsAs(ctx, &attributeValues, false)
 			for _, attributeValue := range attributeValues {
diff --git a/internal/provider/resource_aci_bridge_domain.go b/internal/provider/resource_aci_bridge_domain.go
index 34205ac0e..f3cb97341 100644
--- a/internal/provider/resource_aci_bridge_domain.go
+++ b/internal/provider/resource_aci_bridge_domain.go
@@ -2644,7 +2644,7 @@ func (r *FvBDResource) ModifyPlan(ctx context.Context, req resource.ModifyPlanRe
 			var attributeValues []FvRsBDToNetflowMonitorPolFvBDResourceModelV1
 			var newAttributeValues []FvRsBDToNetflowMonitorPolFvBDResourceModel
 			if stateData != nil {
-				stateData.DeprecatedFvRsBDToNetflowMonitorPol.ElementsAs(ctx, &newAttributeValues, false)
+				stateData.FvRsBDToNetflowMonitorPol.ElementsAs(ctx, &newAttributeValues, false)
 			}
 			planData.DeprecatedFvRsBDToNetflowMonitorPol.ElementsAs(ctx, &attributeValues, false)
 			for _, attributeValue := range attributeValues {
diff --git a/internal/provider/resource_aci_endpoint_security_group.go b/internal/provider/resource_aci_endpoint_security_group.go
index d1d9adcce..ae02689e3 100644
--- a/internal/provider/resource_aci_endpoint_security_group.go
+++ b/internal/provider/resource_aci_endpoint_security_group.go
@@ -1550,7 +1550,7 @@ func (r *FvESgResource) ModifyPlan(ctx context.Context, req resource.ModifyPlanR
 			var attributeValues []FvRsConsFvESgResourceModelV1
 			var newAttributeValues []FvRsConsFvESgResourceModel
 			if stateData != nil {
-				stateData.DeprecatedFvRsCons.ElementsAs(ctx, &newAttributeValues, false)
+				stateData.FvRsCons.ElementsAs(ctx, &newAttributeValues, false)
 			}
 			planData.DeprecatedFvRsCons.ElementsAs(ctx, &attributeValues, false)
 			for _, attributeValue := range attributeValues {
@@ -1597,7 +1597,7 @@ func (r *FvESgResource) ModifyPlan(ctx context.Context, req resource.ModifyPlanR
 			var attributeValues []FvRsConsIfFvESgResourceModelV1
 			var newAttributeValues []FvRsConsIfFvESgResourceModel
 			if stateData != nil {
-				stateData.DeprecatedFvRsConsIf.ElementsAs(ctx, &newAttributeValues, false)
+				stateData.FvRsConsIf.ElementsAs(ctx, &newAttributeValues, false)
 			}
 			planData.DeprecatedFvRsConsIf.ElementsAs(ctx, &attributeValues, false)
 			for _, attributeValue := range attributeValues {
@@ -1644,7 +1644,7 @@ func (r *FvESgResource) ModifyPlan(ctx context.Context, req resource.ModifyPlanR
 			var attributeValues []FvRsProvFvESgResourceModelV1
 			var newAttributeValues []FvRsProvFvESgResourceModel
 			if stateData != nil {
-				stateData.DeprecatedFvRsProv.ElementsAs(ctx, &newAttributeValues, false)
+				stateData.FvRsProv.ElementsAs(ctx, &newAttributeValues, false)
 			}
 			planData.DeprecatedFvRsProv.ElementsAs(ctx, &attributeValues, false)
 			for _, attributeValue := range attributeValues {