diff --git a/docs/data-sources/netflow_monitor_policy.md b/docs/data-sources/netflow_monitor_policy.md
index 8eb34c9dd..78b8ac47f 100644
--- a/docs/data-sources/netflow_monitor_policy.md
+++ b/docs/data-sources/netflow_monitor_policy.md
@@ -25,7 +25,9 @@ Data source for Netflow Monitor Policy
 
 ## GUI Information ##
 
-* Location: `Tenants -> Policies -> NetFlow -> NetFlow Monitors`
+* Locations:
+  - `Tenants -> Policies -> NetFlow -> NetFlow Monitors`
+  - `Fabric -> Access Policies -> Policies -> Interface -> NetFlow -> NetFlow Monitors`
 
 ## Example Usage ##
 
diff --git a/docs/data-sources/relation_to_netflow_exporter.md b/docs/data-sources/relation_to_netflow_exporter.md
index 378e87d0c..9e4f25730 100644
--- a/docs/data-sources/relation_to_netflow_exporter.md
+++ b/docs/data-sources/relation_to_netflow_exporter.md
@@ -25,7 +25,9 @@ Data source for Relation To Netflow Exporter
 
 ## GUI Information ##
 
-* Location: `Tenants -> Policies -> NetFlow -> NetFlow Monitors`
+* Locations:
+  - `Tenants -> Policies -> NetFlow -> NetFlow Monitors`
+  - `Fabric -> Access Policies -> Policies -> Interface -> NetFlow -> NetFlow Monitors`
 
 ## Example Usage ##
 
diff --git a/docs/resources/netflow_monitor_policy.md b/docs/resources/netflow_monitor_policy.md
index abdd203fe..b8fe7a861 100644
--- a/docs/resources/netflow_monitor_policy.md
+++ b/docs/resources/netflow_monitor_policy.md
@@ -27,7 +27,9 @@ Manages ACI Netflow Monitor Policy
 
 ## GUI Information ##
 
-* Location: `Tenants -> Policies -> NetFlow -> NetFlow Monitors`
+* Locations:
+  - `Tenants -> Policies -> NetFlow -> NetFlow Monitors`
+  - `Fabric -> Access Policies -> Policies -> Interface -> NetFlow -> NetFlow Monitors`
 
 ## Example Usage ##
 
diff --git a/docs/resources/relation_to_netflow_exporter.md b/docs/resources/relation_to_netflow_exporter.md
index 26f2ef51a..4db430b13 100644
--- a/docs/resources/relation_to_netflow_exporter.md
+++ b/docs/resources/relation_to_netflow_exporter.md
@@ -27,7 +27,9 @@ Manages ACI Relation To Netflow Exporter
 
 ## GUI Information ##
 
-* Location: `Tenants -> Policies -> NetFlow -> NetFlow Monitors`
+* Locations:
+  - `Tenants -> Policies -> NetFlow -> NetFlow Monitors`
+  - `Fabric -> Access Policies -> Policies -> Interface -> NetFlow -> NetFlow Monitors`
 
 ## Example Usage ##
 
diff --git a/gen/definitions/classes.yaml b/gen/definitions/classes.yaml
index cf2c92ce4..be2acf0e5 100644
--- a/gen/definitions/classes.yaml
+++ b/gen/definitions/classes.yaml
@@ -169,28 +169,33 @@ netflowMonitorPol:
   resource_name: "netflow_monitor_policy"
   ui_locations:
     - "Tenants -> Policies -> NetFlow -> NetFlow Monitors"
+    - "Fabric -> Access Policies -> Policies -> Interface -> NetFlow -> NetFlow Monitors"
   sub_category: "Tenant Policies"
 
 netflowRsMonitorToRecord:
   resource_name: "relation_to_netflow_record"
   ui_locations:
     - "Tenants -> Policies -> NetFlow -> NetFlow Monitors"
+    - "Fabric -> Access Policies -> Policies -> Interface -> NetFlow -> NetFlow Monitors"
   sub_category: "Tenant Policies"
 
 netflowRsMonitorToExporter:
   resource_name: "relation_to_netflow_exporter"
   ui_locations:
     - "Tenants -> Policies -> NetFlow -> NetFlow Monitors"
+    - "Fabric -> Access Policies -> Policies -> Interface -> NetFlow -> NetFlow Monitors"
   sub_category: "Tenant Policies"
 
 netflowExporterPol:
   resource_name: "netflow_exporter_policy"
   ui_locations:
     - "Tenants -> Policies -> NetFlow -> NetFlow Exporters"
+    - "Fabric -> Access Policies -> Policies -> Interface -> NetFlow -> NetFlow Exporters"
   sub_category: "Tenant Policies"
 
 netflowRecordPol:
   resource_name: "netflow_record_policy"
   ui_locations:
     - "Tenants -> Policies -> NetFlow -> NetFlow Records"
+    - "Fabric -> Access Policies -> Policies -> Interface -> NetFlow -> NetFlow Records"
   sub_category: "Tenant Policies"
diff --git a/gen/generator.go b/gen/generator.go
index 1b9ba1b9f..ba1228518 100644
--- a/gen/generator.go
+++ b/gen/generator.go
@@ -1116,9 +1116,9 @@ func (m *Model) SetClassProperties(classDetails interface{}) {
 				}
 			}
 
-			DefaultValueOverwrite := GetDefaultValues(m.PkgName, propertyName, m.Definitions)
-			if DefaultValueOverwrite != "" {
-				property.DefaultValue = DefaultValueOverwrite
+			defaultValueOverwrite := GetDefaultValues(m.PkgName, propertyName, m.Definitions)
+			if defaultValueOverwrite != "" {
+				property.DefaultValue = defaultValueOverwrite
 			} else {
 				val, ok = propertyValue.(map[string]interface{})["default"]
 				if ok {