diff --git a/docs/data-sources/netflow_exporter_policy.md b/docs/data-sources/netflow_exporter_policy.md
index 95c5492d3..f03edd29d 100644
--- a/docs/data-sources/netflow_exporter_policy.md
+++ b/docs/data-sources/netflow_exporter_policy.md
@@ -71,16 +71,16 @@ data "aci_netflow_exporter_policy" "example_tenant" {
 * `source_ip_address` (srcAddr) - (string) The source IP address.
 * `version` (ver) - (string) The NetFlow Exporter Version of the NetFlow Exporter Policy object.
 
-* `relation_to_vrf` - (list) A list of Relation To VRF (ACI object [netflowRsExporterToCtx](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/netflowRsExporterToCtx/overview)) pointing to VRF (ACI Object [fvCtx](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/fvCtx/overview)).
-  * `annotation` (annotation) - (string) The annotation of the Relation To VRF object.
+* `relation_to_vrf` - (list) A list of Relation From NetFlow Exporter To VRF (ACI object [netflowRsExporterToCtx](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/netflowRsExporterToCtx/overview)) pointing to VRF (ACI Object [fvCtx](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/fvCtx/overview)).
+  * `annotation` (annotation) - (string) The annotation of the Relation From NetFlow Exporter To VRF object.
   * `target_dn` (tDn) - (string) The distinguished name of the target.
 
       
-* `relation_to_epg` - (list) A list of Relation To EPG (ACI object [netflowRsExporterToEPg](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/netflowRsExporterToEPg/overview)). This relation can point to multiple ACI objects:
+* `relation_to_epg` - (list) A list of Relation From NetFlow Exporter To EPG (ACI object [netflowRsExporterToEPg](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/netflowRsExporterToEPg/overview)). This relation can point to multiple ACI objects:
     - [fvAEPg](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/fvAEPg/overview).
     - [l3extInstP](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/l3extInstP/overview).
     - [l2extInstP](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/l2extInstP/overview).
-  * `annotation` (annotation) - (string) The annotation of the Relation To EPG object.
+  * `annotation` (annotation) - (string) The annotation of the Relation From NetFlow Exporter To EPG object.
   * `target_dn` (tDn) - (string) The distinguished name of the target.
 
 * `annotations` - (list) A list of Annotations (ACI object [tagAnnotation](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/tagAnnotation/overview)). This attribute is supported in ACI versions: 3.2(1l) and later.
diff --git a/docs/resources/netflow_exporter_policy.md b/docs/resources/netflow_exporter_policy.md
index 70b428aa1..d284984da 100644
--- a/docs/resources/netflow_exporter_policy.md
+++ b/docs/resources/netflow_exporter_policy.md
@@ -138,18 +138,18 @@ All examples for the NetFlow Exporter Policy resource can be found in the [examp
   - Default: `v9`
   - Valid Values: `cisco-v1`, `v5`, `v9`.
 
-* `relation_to_vrf` - (list) A list of Relation To VRF (ACI object [netflowRsExporterToCtx](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/netflowRsExporterToCtx/overview)) pointing to VRF (ACI Object [fvCtx](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/fvCtx/overview)) which can be configured using the [aci_vrf](https://registry.terraform.io/providers/CiscoDevNet/aci/latest/docs/resources/vrf) resource.
+* `relation_to_vrf` - (list) A list of Relation From NetFlow Exporter To VRF (ACI object [netflowRsExporterToCtx](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/netflowRsExporterToCtx/overview)) pointing to VRF (ACI Object [fvCtx](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/fvCtx/overview)) which can be configured using the [aci_vrf](https://registry.terraform.io/providers/CiscoDevNet/aci/latest/docs/resources/vrf) resource.
     - Max Items: 1
   
 
   #### Optional ####
     
-  * `annotation` (annotation) - (string) The annotation of the Relation To VRF object.
+  * `annotation` (annotation) - (string) The annotation of the Relation From NetFlow Exporter To VRF object.
       - Default: `orchestrator:terraform`
   * `target_dn` (tDn) - (string) The distinguished name of the target.
 
       
-* `relation_to_epg` - (list) A list of Relation To EPG (ACI object [netflowRsExporterToEPg](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/netflowRsExporterToEPg/overview)). This relation can point to multiple ACI objects:
+* `relation_to_epg` - (list) A list of Relation From NetFlow Exporter To EPG (ACI object [netflowRsExporterToEPg](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/netflowRsExporterToEPg/overview)). This relation can point to multiple ACI objects:
     - [fvAEPg](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/fvAEPg/overview) which can be configured using the [aci_application_epg](https://registry.terraform.io/providers/CiscoDevNet/aci/latest/docs/resources/application_epg) resource.
     - [l3extInstP](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/l3extInstP/overview) which can be configured using the [aci_external_network_instance_profile](https://registry.terraform.io/providers/CiscoDevNet/aci/latest/docs/resources/external_network_instance_profile) resource.
     - [l2extInstP](https://pubhub.devnetcloud.com/media/model-doc-latest/docs/app/index.html#/objects/l2extInstP/overview) which can be configured using the [aci_l2out_extepg](https://registry.terraform.io/providers/CiscoDevNet/aci/latest/docs/resources/l2out_extepg) resource.
@@ -157,7 +157,7 @@ All examples for the NetFlow Exporter Policy resource can be found in the [examp
 
   #### Optional ####
     
-  * `annotation` (annotation) - (string) The annotation of the Relation To EPG object.
+  * `annotation` (annotation) - (string) The annotation of the Relation From NetFlow Exporter To EPG object.
       - Default: `orchestrator:terraform`
   * `target_dn` (tDn) - (string) The distinguished name of the target.
 
diff --git a/gen/definitions/classes.yaml b/gen/definitions/classes.yaml
index bac0e5fa7..5d1ee8fa7 100644
--- a/gen/definitions/classes.yaml
+++ b/gen/definitions/classes.yaml
@@ -353,7 +353,7 @@ netflowExporterPol:
   sub_category: "Tenant Policies"
 
 netflowRsExporterToEPg:
-  resource_name: "relation_to_epg"
+  resource_name: "relation_from_netflow_exporter_to_epg"
   ui_locations:
     - "Tenants -> Policies -> NetFlow -> NetFlow Exporters"
     - "Fabric -> Access Policies -> Policies -> Interface -> NetFlow -> NetFlow Exporters"
@@ -365,7 +365,7 @@ netflowRsExporterToEPg:
     - "l2extInstP"
 
 netflowRsExporterToCtx:
-  resource_name: "relation_to_vrf"
+  resource_name: "relation_from_netflow_exporter_to_vrf"
   ui_locations:
     - "Tenants -> Policies -> NetFlow -> NetFlow Exporters"
     - "Fabric -> Access Policies -> Policies -> Interface -> NetFlow -> NetFlow Exporters"
diff --git a/gen/definitions/properties.yaml b/gen/definitions/properties.yaml
index 2d3e99c9b..0722fde84 100644
--- a/gen/definitions/properties.yaml
+++ b/gen/definitions/properties.yaml
@@ -57,6 +57,10 @@ resource_name_overwrite:
   relation_from_l3out_consumer_label_to_external_epg: "external_network_instance_profile"
   relation_to_external_epgs: "external_network_instance_profile"
   relation_from_l3out_consumer_label_to_route_control_profile: "route_control_profile"
+  relation_to_vrf: "vrf"
+  relation_from_netflow_exporter_to_vrf: "vrf"
+  relation_to_epg: "application_epg"
+  relation_from_netflow_exporter_to_epg: "application_epg"
 
 l3extRsRedistributePol:
   overwrites:
@@ -93,11 +97,11 @@ mgmtSubnet:
       ip: "2.2.2.0/24"
 
 mgmtInstP:
-  ignore_customtype_docs:
+  ignore_custom_type_docs:
     - "Prio"
 
 mgmtRsOoBCons:
-  ignore_customtype_docs:
+  ignore_custom_type_docs:
     - "Prio"
 
 l3extConsLbl:
@@ -416,7 +420,7 @@ fvRsScope:
 fvRsCons:
   ignores:
     - "intent"
-  ignore_customtype_docs:
+  ignore_custom_type_docs:
     - "Prio"
   parents:
     - class_name: "fvESg"
@@ -427,7 +431,7 @@ fvRsCons:
 fvRsProv:
   ignores:
     - "intent"
-  ignore_customtype_docs:
+  ignore_custom_type_docs:
     - "Prio"
   parents:
     - class_name: "fvESg"
@@ -436,7 +440,7 @@ fvRsProv:
       parent_dependency: "fvAp"
 
 fvRsConsIf:
-  ignore_customtype_docs:
+  ignore_custom_type_docs:
     - "Prio"
   parents:
     - class_name: "fvESg"
@@ -673,7 +677,7 @@ fvAEPg:
   remove_valid_values:
     pcTag:
       - "any"
-  ignore_customtype_docs:
+  ignore_custom_type_docs:
     - "Prio"
   default_values:
     shutdown: "no"
@@ -981,6 +985,8 @@ netflowExporterPol:
       parent_dn: "aci_tenant.test.id"
 
 netflowRsExporterToEPg:
+  overwrites:
+    relation_from_netflow_exporter_to_epg: "relation_to_epg"
   parents:
     - class_name: "netflowExporterPol"
       target_classes:
@@ -989,10 +995,12 @@ netflowRsExporterToEPg:
     - class_name: "fvAEPg"
       target_dn: "uni/tn-test_tenant/ap-test_ap/epg-test_epg"
       target_dn_overwrite_docs: "aci_application_epg.example.id"
-      relation_resource_name: "epg"
+      relation_resource_name: "application_epg"
       static: true
 
 netflowRsExporterToCtx:
+  overwrites:
+    relation_from_netflow_exporter_to_vrf: "relation_to_vrf"
   parents:
     - class_name: "netflowExporterPol"
       target_classes:
diff --git a/gen/generator.go b/gen/generator.go
index 99de0cc33..556e0e814 100644
--- a/gen/generator.go
+++ b/gen/generator.go
@@ -2448,7 +2448,7 @@ func IsRequiredInTestValue(classPkgName, propertyName string, definitions Defini
 func HasCustomTypeDocs(classPkgName, propertyName string, definitions Definitions) bool {
 	if classDetails, ok := definitions.Properties[classPkgName]; ok {
 		for key, value := range classDetails.(map[interface{}]interface{}) {
-			if key.(string) == "ignore_customtype_docs" {
+			if key.(string) == "ignore_custom_type_docs" {
 				for _, property := range value.([]interface{}) {
 					if property.(string) == propertyName {
 						return false
diff --git a/gen/templates/resource_test.go.tmpl b/gen/templates/resource_test.go.tmpl
index a9f90f768..8f78718ee 100644
--- a/gen/templates/resource_test.go.tmpl
+++ b/gen/templates/resource_test.go.tmpl
@@ -412,13 +412,13 @@ func TestAccResource{{$.resourceClassName}}With{{capitalize .class_name}}(t *tes
 				),
 			},
 		{{- end}}
-		{{- if $.customtype}}
-			// Update with minimum config and customtype semantic equivalent values
+		{{- if $.custom_type}}
+			// Update with minimum config and custom type semantic equivalent values
 			{
 				Config: testConfig{{$.resourceClassName}}CustomTypeDependencyWith{{capitalize .class_name}},
 				ExpectNonEmptyPlan: {{.class_in_parent}},
 				Check: resource.ComposeAggregateTestCheckFunc(
-			{{- range $key, $value := $.customtype}}
+			{{- range $key, $value := $.custom_type}}
 				{{- if eq $key "target_dn" }}
 					resource.TestCheckResourceAttr("aci_{{$.resourceName}}.test{{- if eq $.resourceClassName $parentClassName }}_1{{- end }}", "{{$key}}", "{{getTestTargetDn $.targets $.resourceName $value false $target_classes 0 false}}"),
 				{{- else }}
@@ -821,12 +821,12 @@ func TestAccResource{{.resourceClassName}}(t *testing.T) {
 				),
 			},
 	{{- end}}
-		{{- if $.customtype}}
-			// Update with minimum config and customtype semantic equivalent values
+		{{- if $.custom_type}}
+			// Update with minimum config and custom type semantic equivalent values
 			{
 				Config: testConfig{{$.resourceClassName}}CustomType,
 				Check: resource.ComposeAggregateTestCheckFunc(
-			{{- range $key, $value := $.customtype}}
+			{{- range $key, $value := $.custom_type}}
 				{{- if eq $key "target_dn" }}
 					resource.TestCheckResourceAttr("aci_{{$.resourceName}}.test", "{{$key}}", "{{getTestTargetDn $.targets $.resourceName $value false nil 0 false}}"),
 				{{- else }}
@@ -1070,11 +1070,11 @@ resource "aci_{{$.resourceName}}" "test{{- if eq $.resourceClassName $parentClas
 `
 		{{- end}}
 
-		{{if $.customtype}}
+		{{if $.custom_type}}
 const testConfig{{$.resourceClassName}}CustomTypeDependencyWith{{capitalize .class_name}} = {{- if $dependencies }} testDependencyConfig{{$.resourceClassName}} + {{- end }} testConfig{{capitalize .class_name}}Min{{- if ne .parent_dependency ""}}DependencyWith{{capitalize .parent_dependency}}{{if and (ne .parent_dependency_name nil) (ne .parent_dependency_name "")}}{{capitalize .parent_dependency_name }}{{- end }}{{- end}} + `
 resource "aci_{{$.resourceName}}" "test{{- if eq $.resourceClassName $parentClassName }}_1{{- end }}" {
   parent_dn = {{.parent_dn}}
-  		{{- range $key, $value := $.customtype}}
+  		{{- range $key, $value := $.custom_type}}
   			{{- if eq $key "target_dn" }}{{$attributeValue := getTestTargetDn $.targets $.resourceName $value true $target_classes 0 false}}
   {{$key}} = {{if containsString $attributeValue "."}}{{$attributeValue}}{{else}}"{{$attributeValue}}"{{end}}
   			{{- else }}
@@ -1246,10 +1246,10 @@ resource "aci_{{$.resourceName}}" "test" {
 `
 	{{- end}}
 
-	{{if $.customtype}}
+	{{if $.custom_type}}
 const testConfig{{.resourceClassName}}CustomType = `
 resource "aci_{{$.resourceName}}" "test" {
-	{{- range $key, $value := $.customtype}}
+	{{- range $key, $value := $.custom_type}}
   {{$key}} = "{{$value}}"
 	{{- end}}
 }
diff --git a/gen/templates/testvars.yaml.tmpl b/gen/templates/testvars.yaml.tmpl
index 664f5dd4c..6b35420e8 100644
--- a/gen/templates/testvars.yaml.tmpl
+++ b/gen/templates/testvars.yaml.tmpl
@@ -53,7 +53,7 @@ resource_required:
   {{- end}}
   {{- if .HasCustomTypeProperties}}
 
-customtype:
+custom_type:
     {{- range .Properties}}{{$testValue := createTestValue .SnakeCaseName}}{{$overwritePropertyName := overwriteProperty .PkgName .SnakeCaseName $.Definitions}}
       {{- if .HasCustomType}}
   {{overwriteProperty .PkgName .SnakeCaseName $.Definitions}}: {{$validValuesMap := .ValidValuesMap}}{{range $key, $value := $validValuesMap}}{{if or (ne $value "unspecified") (eq (len $validValuesMap) 1)}}"{{$key}}"{{break}}{{end}}{{end}}
diff --git a/gen/testvars/fvAEPg.yaml b/gen/testvars/fvAEPg.yaml
index 0dfc712bc..449664a62 100644
--- a/gen/testvars/fvAEPg.yaml
+++ b/gen/testvars/fvAEPg.yaml
@@ -26,7 +26,7 @@ datasource_required:
 resource_required:
   name: "test_name"
 
-customtype:
+custom_type:
   name: "test_name"
   priority: "1"
 
diff --git a/gen/testvars/fvRsCons.yaml b/gen/testvars/fvRsCons.yaml
index cccad5df5..b7a74742a 100644
--- a/gen/testvars/fvRsCons.yaml
+++ b/gen/testvars/fvRsCons.yaml
@@ -15,7 +15,7 @@ datasource_required:
 resource_required:
   contract_name: "test_tn_vz_br_cp_name"
 
-customtype:
+custom_type:
   priority: "1"
   contract_name: "test_tn_vz_br_cp_name"
 
diff --git a/gen/testvars/fvRsConsIf.yaml b/gen/testvars/fvRsConsIf.yaml
index 063f97b69..33e74dbe3 100644
--- a/gen/testvars/fvRsConsIf.yaml
+++ b/gen/testvars/fvRsConsIf.yaml
@@ -15,7 +15,7 @@ datasource_required:
 resource_required:
   imported_contract_name: "test_tn_vz_cp_if_name"
 
-customtype:
+custom_type:
   priority: "1"
   imported_contract_name: "test_tn_vz_cp_if_name"
 
diff --git a/gen/testvars/fvRsProv.yaml b/gen/testvars/fvRsProv.yaml
index 110469e90..c02c0ea41 100644
--- a/gen/testvars/fvRsProv.yaml
+++ b/gen/testvars/fvRsProv.yaml
@@ -16,7 +16,7 @@ datasource_required:
 resource_required:
   contract_name: "test_tn_vz_br_cp_name"
 
-customtype:
+custom_type:
   priority: "1"
   contract_name: "test_tn_vz_br_cp_name"
 
diff --git a/gen/testvars/mgmtInstP.yaml b/gen/testvars/mgmtInstP.yaml
index 84f3ad378..f7bf2d1ae 100644
--- a/gen/testvars/mgmtInstP.yaml
+++ b/gen/testvars/mgmtInstP.yaml
@@ -17,7 +17,7 @@ datasource_required:
 resource_required:
   name: "test_name"
 
-customtype:
+custom_type:
   name: "test_name"
   priority: "1"
 
diff --git a/gen/testvars/mgmtRsOoBCons.yaml b/gen/testvars/mgmtRsOoBCons.yaml
index 5b44d18b2..965e62c0d 100644
--- a/gen/testvars/mgmtRsOoBCons.yaml
+++ b/gen/testvars/mgmtRsOoBCons.yaml
@@ -15,7 +15,7 @@ datasource_required:
 resource_required:
   out_of_band_contract_name: "test_tn_vz_oob_br_cp_name"
 
-customtype:
+custom_type:
   priority: "1"
   out_of_band_contract_name: "test_tn_vz_oob_br_cp_name"
 
diff --git a/gen/testvars/netflowExporterPol.yaml b/gen/testvars/netflowExporterPol.yaml
index 51d30897d..18b68114d 100644
--- a/gen/testvars/netflowExporterPol.yaml
+++ b/gen/testvars/netflowExporterPol.yaml
@@ -27,7 +27,7 @@ resource_required:
   name: "netfow_exporter"
   source_ip_address: "1.1.1.1/10"
 
-customtype:
+custom_type:
   qos_dscp_value: "0"
   destination_ip_address: "2.2.2.1"
   destination_port: "110"
@@ -84,5 +84,5 @@ child_targets:
   - class_name: "fvAEPg"
     target_dn: "uni/tn-test_tenant/ap-test_ap/epg-test_epg"
     target_dn_overwrite_docs: "aci_application_epg.example.id"
-    relation_resource_name: "epg"
+    relation_resource_name: "application_epg"
     static: true
diff --git a/gen/testvars/qosDppPol.yaml b/gen/testvars/qosDppPol.yaml
index 640e05be5..dfd8616ac 100644
--- a/gen/testvars/qosDppPol.yaml
+++ b/gen/testvars/qosDppPol.yaml
@@ -39,7 +39,7 @@ datasource_required:
 resource_required:
   name: "test_name"
 
-customtype:
+custom_type:
   excessive_burst: "0xffffffffffffffff"
   burst: "0xffffffffffffffff"
   conform_mark_cos: "0xffff"
diff --git a/gen/testvars/vzOOBBrCP.yaml b/gen/testvars/vzOOBBrCP.yaml
index c044e1ab3..d82020d21 100644
--- a/gen/testvars/vzOOBBrCP.yaml
+++ b/gen/testvars/vzOOBBrCP.yaml
@@ -22,7 +22,7 @@ datasource_required:
 resource_required:
   name: "test_name"
 
-customtype:
+custom_type:
   name: "test_name"
   priority: "1"
   target_dscp: "0"
diff --git a/internal/provider/data_source_aci_netflow_exporter_policy.go b/internal/provider/data_source_aci_netflow_exporter_policy.go
index 19f614de6..45a338ca0 100644
--- a/internal/provider/data_source_aci_netflow_exporter_policy.go
+++ b/internal/provider/data_source_aci_netflow_exporter_policy.go
@@ -107,7 +107,7 @@ func (d *NetflowExporterPolDataSource) Schema(ctx context.Context, req datasourc
 					Attributes: map[string]schema.Attribute{
 						"annotation": schema.StringAttribute{
 							Computed:            true,
-							MarkdownDescription: `The annotation of the Relation To VRF object.`,
+							MarkdownDescription: `The annotation of the Relation From NetFlow Exporter To VRF object.`,
 						},
 						"target_dn": schema.StringAttribute{
 							Computed:            true,
@@ -123,7 +123,7 @@ func (d *NetflowExporterPolDataSource) Schema(ctx context.Context, req datasourc
 					Attributes: map[string]schema.Attribute{
 						"annotation": schema.StringAttribute{
 							Computed:            true,
-							MarkdownDescription: `The annotation of the Relation To EPG object.`,
+							MarkdownDescription: `The annotation of the Relation From NetFlow Exporter To EPG object.`,
 						},
 						"target_dn": schema.StringAttribute{
 							Computed:            true,
diff --git a/internal/provider/resource_aci_application_epg_test.go b/internal/provider/resource_aci_application_epg_test.go
index 58d7d6afd..89872e050 100644
--- a/internal/provider/resource_aci_application_epg_test.go
+++ b/internal/provider/resource_aci_application_epg_test.go
@@ -661,7 +661,7 @@ func TestAccResourceFvAEPgWithFvAp(t *testing.T) {
 					resource.TestCheckResourceAttr("aci_application_epg.test", "tags.#", "0"),
 				),
 			},
-			// Update with minimum config and customtype semantic equivalent values
+			// Update with minimum config and custom type semantic equivalent values
 			{
 				Config:             testConfigFvAEPgCustomTypeDependencyWithFvAp,
 				ExpectNonEmptyPlan: false,
diff --git a/internal/provider/resource_aci_data_plane_policing_policy_test.go b/internal/provider/resource_aci_data_plane_policing_policy_test.go
index dd8b02d9d..baf1bd17c 100644
--- a/internal/provider/resource_aci_data_plane_policing_policy_test.go
+++ b/internal/provider/resource_aci_data_plane_policing_policy_test.go
@@ -375,7 +375,7 @@ func TestAccResourceQosDppPolWithFvTenant(t *testing.T) {
 					resource.TestCheckResourceAttr("aci_data_plane_policing_policy.test", "tags.#", "0"),
 				),
 			},
-			// Update with minimum config and customtype semantic equivalent values
+			// Update with minimum config and custom type semantic equivalent values
 			{
 				Config:             testConfigQosDppPolCustomTypeDependencyWithFvTenant,
 				ExpectNonEmptyPlan: false,
diff --git a/internal/provider/resource_aci_external_management_network_instance_profile_test.go b/internal/provider/resource_aci_external_management_network_instance_profile_test.go
index fd7083718..a28ef0948 100644
--- a/internal/provider/resource_aci_external_management_network_instance_profile_test.go
+++ b/internal/provider/resource_aci_external_management_network_instance_profile_test.go
@@ -214,7 +214,7 @@ func TestAccResourceMgmtInstP(t *testing.T) {
 					resource.TestCheckResourceAttr("aci_external_management_network_instance_profile.test", "tags.#", "0"),
 				),
 			},
-			// Update with minimum config and customtype semantic equivalent values
+			// Update with minimum config and custom type semantic equivalent values
 			{
 				Config: testConfigMgmtInstPCustomType,
 				Check: resource.ComposeAggregateTestCheckFunc(
diff --git a/internal/provider/resource_aci_netflow_exporter_policy.go b/internal/provider/resource_aci_netflow_exporter_policy.go
index ea90f1490..9a43ed3db 100644
--- a/internal/provider/resource_aci_netflow_exporter_policy.go
+++ b/internal/provider/resource_aci_netflow_exporter_policy.go
@@ -366,7 +366,7 @@ func (r *NetflowExporterPolResource) Schema(ctx context.Context, req resource.Sc
 							PlanModifiers: []planmodifier.String{
 								stringplanmodifier.UseStateForUnknown(),
 							},
-							MarkdownDescription: `The annotation of the Relation To VRF object.`,
+							MarkdownDescription: `The annotation of the Relation From NetFlow Exporter To VRF object.`,
 						},
 						"target_dn": schema.StringAttribute{
 							Optional: true,
@@ -397,7 +397,7 @@ func (r *NetflowExporterPolResource) Schema(ctx context.Context, req resource.Sc
 							PlanModifiers: []planmodifier.String{
 								stringplanmodifier.UseStateForUnknown(),
 							},
-							MarkdownDescription: `The annotation of the Relation To EPG object.`,
+							MarkdownDescription: `The annotation of the Relation From NetFlow Exporter To EPG object.`,
 						},
 						"target_dn": schema.StringAttribute{
 							Optional: true,
diff --git a/internal/provider/resource_aci_netflow_exporter_policy_test.go b/internal/provider/resource_aci_netflow_exporter_policy_test.go
index e8031694c..19b3cc5a7 100644
--- a/internal/provider/resource_aci_netflow_exporter_policy_test.go
+++ b/internal/provider/resource_aci_netflow_exporter_policy_test.go
@@ -272,7 +272,7 @@ func TestAccResourceNetflowExporterPolWithFvTenant(t *testing.T) {
 					resource.TestCheckResourceAttr("aci_netflow_exporter_policy.test", "tags.#", "0"),
 				),
 			},
-			// Update with minimum config and customtype semantic equivalent values
+			// Update with minimum config and custom type semantic equivalent values
 			{
 				Config:             testConfigNetflowExporterPolCustomTypeDependencyWithFvTenant,
 				ExpectNonEmptyPlan: false,
diff --git a/internal/provider/resource_aci_out_of_band_contract_test.go b/internal/provider/resource_aci_out_of_band_contract_test.go
index b2c5b414f..8c20a117b 100644
--- a/internal/provider/resource_aci_out_of_band_contract_test.go
+++ b/internal/provider/resource_aci_out_of_band_contract_test.go
@@ -255,7 +255,7 @@ func TestAccResourceVzOOBBrCP(t *testing.T) {
 					resource.TestCheckResourceAttr("aci_out_of_band_contract.test", "tags.#", "0"),
 				),
 			},
-			// Update with minimum config and customtype semantic equivalent values
+			// Update with minimum config and custom type semantic equivalent values
 			{
 				Config: testConfigVzOOBBrCPCustomType,
 				Check: resource.ComposeAggregateTestCheckFunc(
diff --git a/internal/provider/resource_aci_relation_to_consumed_contract_test.go b/internal/provider/resource_aci_relation_to_consumed_contract_test.go
index 4eabfedbc..8b82f2722 100644
--- a/internal/provider/resource_aci_relation_to_consumed_contract_test.go
+++ b/internal/provider/resource_aci_relation_to_consumed_contract_test.go
@@ -183,7 +183,7 @@ func TestAccResourceFvRsConsWithFvAEPg(t *testing.T) {
 					resource.TestCheckResourceAttr("aci_relation_to_consumed_contract.test", "tags.#", "0"),
 				),
 			},
-			// Update with minimum config and customtype semantic equivalent values
+			// Update with minimum config and custom type semantic equivalent values
 			{
 				Config:             testConfigFvRsConsCustomTypeDependencyWithFvAEPg,
 				ExpectNonEmptyPlan: false,
@@ -367,7 +367,7 @@ func TestAccResourceFvRsConsWithFvESg(t *testing.T) {
 					resource.TestCheckResourceAttr("aci_relation_to_consumed_contract.test", "tags.#", "0"),
 				),
 			},
-			// Update with minimum config and customtype semantic equivalent values
+			// Update with minimum config and custom type semantic equivalent values
 			{
 				Config:             testConfigFvRsConsCustomTypeDependencyWithFvESg,
 				ExpectNonEmptyPlan: false,
diff --git a/internal/provider/resource_aci_relation_to_consumed_out_of_band_contract_test.go b/internal/provider/resource_aci_relation_to_consumed_out_of_band_contract_test.go
index 71c2a56e7..f4b9b1849 100644
--- a/internal/provider/resource_aci_relation_to_consumed_out_of_band_contract_test.go
+++ b/internal/provider/resource_aci_relation_to_consumed_out_of_band_contract_test.go
@@ -183,7 +183,7 @@ func TestAccResourceMgmtRsOoBConsWithMgmtInstP(t *testing.T) {
 					resource.TestCheckResourceAttr("aci_relation_to_consumed_out_of_band_contract.test", "tags.#", "0"),
 				),
 			},
-			// Update with minimum config and customtype semantic equivalent values
+			// Update with minimum config and custom type semantic equivalent values
 			{
 				Config:             testConfigMgmtRsOoBConsCustomTypeDependencyWithMgmtInstP,
 				ExpectNonEmptyPlan: false,
diff --git a/internal/provider/resource_aci_relation_to_imported_contract_test.go b/internal/provider/resource_aci_relation_to_imported_contract_test.go
index e39ce45ac..5792bad89 100644
--- a/internal/provider/resource_aci_relation_to_imported_contract_test.go
+++ b/internal/provider/resource_aci_relation_to_imported_contract_test.go
@@ -183,7 +183,7 @@ func TestAccResourceFvRsConsIfWithFvAEPg(t *testing.T) {
 					resource.TestCheckResourceAttr("aci_relation_to_imported_contract.test", "tags.#", "0"),
 				),
 			},
-			// Update with minimum config and customtype semantic equivalent values
+			// Update with minimum config and custom type semantic equivalent values
 			{
 				Config:             testConfigFvRsConsIfCustomTypeDependencyWithFvAEPg,
 				ExpectNonEmptyPlan: false,
@@ -367,7 +367,7 @@ func TestAccResourceFvRsConsIfWithFvESg(t *testing.T) {
 					resource.TestCheckResourceAttr("aci_relation_to_imported_contract.test", "tags.#", "0"),
 				),
 			},
-			// Update with minimum config and customtype semantic equivalent values
+			// Update with minimum config and custom type semantic equivalent values
 			{
 				Config:             testConfigFvRsConsIfCustomTypeDependencyWithFvESg,
 				ExpectNonEmptyPlan: false,
diff --git a/internal/provider/resource_aci_relation_to_provided_contract_test.go b/internal/provider/resource_aci_relation_to_provided_contract_test.go
index 4463290e8..412837693 100644
--- a/internal/provider/resource_aci_relation_to_provided_contract_test.go
+++ b/internal/provider/resource_aci_relation_to_provided_contract_test.go
@@ -191,7 +191,7 @@ func TestAccResourceFvRsProvWithFvAEPg(t *testing.T) {
 					resource.TestCheckResourceAttr("aci_relation_to_provided_contract.test", "tags.#", "0"),
 				),
 			},
-			// Update with minimum config and customtype semantic equivalent values
+			// Update with minimum config and custom type semantic equivalent values
 			{
 				Config:             testConfigFvRsProvCustomTypeDependencyWithFvAEPg,
 				ExpectNonEmptyPlan: false,
@@ -383,7 +383,7 @@ func TestAccResourceFvRsProvWithFvESg(t *testing.T) {
 					resource.TestCheckResourceAttr("aci_relation_to_provided_contract.test", "tags.#", "0"),
 				),
 			},
-			// Update with minimum config and customtype semantic equivalent values
+			// Update with minimum config and custom type semantic equivalent values
 			{
 				Config:             testConfigFvRsProvCustomTypeDependencyWithFvESg,
 				ExpectNonEmptyPlan: false,