diff --git a/home/nipa/nipa_out/997650/ynl/old-code/nl80211-user.c b/home/nipa/nipa_out/997650/ynl/new-code/nl80211-user.c
index 52f5cffbf100..4831af26a13a 100644
--- a/home/nipa/nipa_out/997650/ynl/old-code/nl80211-user.c
+++ b/home/nipa/nipa_out/997650/ynl/new-code/nl80211-user.c
@@ -1609,7 +1609,7 @@ int nl80211_if_combination_attributes_parse(struct ynl_parse_arg *yarg,
 			ynl_attr_for_each_nested(attr2, attr) {
 				if (ynl_attr_validate(yarg, attr2))
 					return YNL_PARSE_CB_ERROR;
-				dst->_count.limits++;
+				n_limits++;
 			}
 		} else if (type == NL80211_IFACE_COMB_MAXNUM) {
 			if (ynl_attr_validate(yarg, attr))
@@ -1694,7 +1694,7 @@ int nl80211_sar_attributes_parse(struct ynl_parse_arg *yarg,
 			ynl_attr_for_each_nested(attr2, attr) {
 				if (ynl_attr_validate(yarg, attr2))
 					return YNL_PARSE_CB_ERROR;
-				dst->_count.specs++;
+				n_specs++;
 			}
 		}
 	}
@@ -1901,7 +1901,7 @@ int nl80211_frequency_attrs_parse(struct ynl_parse_arg *yarg,
 			ynl_attr_for_each_nested(attr2, attr) {
 				if (ynl_attr_validate(yarg, attr2))
 					return YNL_PARSE_CB_ERROR;
-				dst->_count.wmm++;
+				n_wmm++;
 			}
 		} else if (type == NL80211_FREQUENCY_ATTR_NO_HE) {
 			unsigned int len;
@@ -2113,7 +2113,7 @@ int nl80211_band_attrs_parse(struct ynl_parse_arg *yarg,
 			ynl_attr_for_each_nested(attr2, attr) {
 				if (ynl_attr_validate(yarg, attr2))
 					return YNL_PARSE_CB_ERROR;
-				dst->_count.freqs++;
+				n_freqs++;
 			}
 		} else if (type == NL80211_BAND_ATTR_RATES) {
 			const struct nlattr *attr2;
@@ -2122,7 +2122,7 @@ int nl80211_band_attrs_parse(struct ynl_parse_arg *yarg,
 			ynl_attr_for_each_nested(attr2, attr) {
 				if (ynl_attr_validate(yarg, attr2))
 					return YNL_PARSE_CB_ERROR;
-				dst->_count.rates++;
+				n_rates++;
 			}
 		} else if (type == NL80211_BAND_ATTR_HT_MCS_SET) {
 			unsigned int len;
@@ -2171,7 +2171,7 @@ int nl80211_band_attrs_parse(struct ynl_parse_arg *yarg,
 			ynl_attr_for_each_nested(attr2, attr) {
 				if (ynl_attr_validate(yarg, attr2))
 					return YNL_PARSE_CB_ERROR;
-				dst->_count.iftype_data++;
+				n_iftype_data++;
 			}
 		} else if (type == NL80211_BAND_ATTR_EDMG_CHANNELS) {
 			unsigned int len;
@@ -2469,7 +2469,7 @@ int nl80211_get_wiphy_rsp_parse(const struct nlmsghdr *nlh,
 			ynl_attr_for_each_nested(attr2, attr) {
 				if (ynl_attr_validate(yarg, attr2))
 					return YNL_PARSE_CB_ERROR;
-				dst->_count.interface_combinations++;
+				n_interface_combinations++;
 			}
 		} else if (type == NL80211_ATTR_MAC) {
 			unsigned int len;
@@ -2593,7 +2593,7 @@ int nl80211_get_wiphy_rsp_parse(const struct nlmsghdr *nlh,
 			ynl_attr_for_each_nested(attr2, attr) {
 				if (ynl_attr_validate(yarg, attr2))
 					return YNL_PARSE_CB_ERROR;
-				dst->_count.supported_commands++;
+				n_supported_commands++;
 			}
 		} else if (type == NL80211_ATTR_SUPPORTED_IFTYPES) {
 			if (ynl_attr_validate(yarg, attr))
@@ -2899,7 +2899,7 @@ int nl80211_get_wiphy_rsp_dump_parse(const struct nlmsghdr *nlh,
 			ynl_attr_for_each_nested(attr2, attr) {
 				if (ynl_attr_validate(yarg, attr2))
 					return YNL_PARSE_CB_ERROR;
-				dst->_count.interface_combinations++;
+				n_interface_combinations++;
 			}
 		} else if (type == NL80211_ATTR_MAC) {
 			unsigned int len;
@@ -3023,7 +3023,7 @@ int nl80211_get_wiphy_rsp_dump_parse(const struct nlmsghdr *nlh,
 			ynl_attr_for_each_nested(attr2, attr) {
 				if (ynl_attr_validate(yarg, attr2))
 					return YNL_PARSE_CB_ERROR;
-				dst->_count.supported_commands++;
+				n_supported_commands++;
 			}
 		} else if (type == NL80211_ATTR_SUPPORTED_IFTYPES) {
 			if (ynl_attr_validate(yarg, attr))
diff --git a/home/nipa/nipa_out/997650/ynl/old-code/nlctrl-user.c b/home/nipa/nipa_out/997650/ynl/new-code/nlctrl-user.c
index 493446af3a99..b23c30699ca9 100644
--- a/home/nipa/nipa_out/997650/ynl/old-code/nlctrl-user.c
+++ b/home/nipa/nipa_out/997650/ynl/new-code/nlctrl-user.c
@@ -388,7 +388,7 @@ int nlctrl_getfamily_rsp_parse(const struct nlmsghdr *nlh,
 			ynl_attr_for_each_nested(attr2, attr) {
 				if (ynl_attr_validate(yarg, attr2))
 					return YNL_PARSE_CB_ERROR;
-				dst->_count.mcast_groups++;
+				n_mcast_groups++;
 			}
 		} else if (type == CTRL_ATTR_OPS) {
 			const struct nlattr *attr2;
@@ -397,7 +397,7 @@ int nlctrl_getfamily_rsp_parse(const struct nlmsghdr *nlh,
 			ynl_attr_for_each_nested(attr2, attr) {
 				if (ynl_attr_validate(yarg, attr2))
 					return YNL_PARSE_CB_ERROR;
-				dst->_count.ops++;
+				n_ops++;
 			}
 		} else if (type == CTRL_ATTR_VERSION) {
 			if (ynl_attr_validate(yarg, attr))
diff --git a/home/nipa/nipa_out/997650/ynl/old-code/rt-link-user.c b/home/nipa/nipa_out/997650/ynl/new-code/rt-link-user.c
index 182bfcc45e4d..2e3f9c698e9b 100644
--- a/home/nipa/nipa_out/997650/ynl/old-code/rt-link-user.c
+++ b/home/nipa/nipa_out/997650/ynl/new-code/rt-link-user.c
@@ -4087,7 +4087,7 @@ int rt_link_link_offload_xstats_parse(struct ynl_parse_arg *yarg,
 			ynl_attr_for_each_nested(attr2, attr) {
 				if (ynl_attr_validate(yarg, attr2))
 					return YNL_PARSE_CB_ERROR;
-				dst->_count.hw_s_info++;
+				n_hw_s_info++;
 			}
 		} else if (type == IFLA_OFFLOAD_XSTATS_L3_STATS) {
 			unsigned int len;
@@ -4548,7 +4548,7 @@ int rt_link_linkinfo_bond_attrs_parse(struct ynl_parse_arg *yarg,
 			ynl_attr_for_each_nested(attr2, attr) {
 				if (ynl_attr_validate(yarg, attr2))
 					return YNL_PARSE_CB_ERROR;
-				dst->_count.arp_ip_target++;
+				n_arp_ip_target++;
 			}
 		} else if (type == IFLA_BOND_ARP_VALIDATE) {
 			if (ynl_attr_validate(yarg, attr))
@@ -4676,7 +4676,7 @@ int rt_link_linkinfo_bond_attrs_parse(struct ynl_parse_arg *yarg,
 			ynl_attr_for_each_nested(attr2, attr) {
 				if (ynl_attr_validate(yarg, attr2))
 					return YNL_PARSE_CB_ERROR;
-				dst->_count.ns_ip6_target++;
+				n_ns_ip6_target++;
 			}
 		} else if (type == IFLA_BOND_COUPLED_CONTROL) {
 			if (ynl_attr_validate(yarg, attr))
diff --git a/home/nipa/nipa_out/997650/ynl/old-code/tc-user.c b/home/nipa/nipa_out/997650/ynl/new-code/tc-user.c
index cd2ce0d07f32..2989196c8bb2 100644
--- a/home/nipa/nipa_out/997650/ynl/old-code/tc-user.c
+++ b/home/nipa/nipa_out/997650/ynl/new-code/tc-user.c
@@ -6438,7 +6438,7 @@ int tc_cake_stats_attrs_parse(struct ynl_parse_arg *yarg,
 			ynl_attr_for_each_nested(attr2, attr) {
 				if (ynl_attr_validate(yarg, attr2))
 					return YNL_PARSE_CB_ERROR;
-				dst->_count.tin_stats++;
+				n_tin_stats++;
 			}
 		} else if (type == TCA_CAKE_STATS_DEFICIT) {
 			if (ynl_attr_validate(yarg, attr))
@@ -7633,7 +7633,7 @@ int tc_basic_attrs_parse(struct ynl_parse_arg *yarg,
 			ynl_attr_for_each_nested(attr2, attr) {
 				if (ynl_attr_validate(yarg, attr2))
 					return YNL_PARSE_CB_ERROR;
-				dst->_count.act++;
+				n_act++;
 			}
 		} else if (type == TCA_BASIC_POLICE) {
 			if (ynl_attr_validate(yarg, attr))
@@ -7746,7 +7746,7 @@ int tc_bpf_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested)
 			ynl_attr_for_each_nested(attr2, attr) {
 				if (ynl_attr_validate(yarg, attr2))
 					return YNL_PARSE_CB_ERROR;
-				dst->_count.act++;
+				n_act++;
 			}
 		} else if (type == TCA_BPF_POLICE) {
 			if (ynl_attr_validate(yarg, attr))
@@ -7890,7 +7890,7 @@ int tc_cgroup_attrs_parse(struct ynl_parse_arg *yarg,
 			ynl_attr_for_each_nested(attr2, attr) {
 				if (ynl_attr_validate(yarg, attr2))
 					return YNL_PARSE_CB_ERROR;
-				dst->_count.act++;
+				n_act++;
 			}
 		} else if (type == TCA_CGROUP_POLICE) {
 			if (ynl_attr_validate(yarg, attr))
@@ -8236,7 +8236,7 @@ int tc_flower_attrs_parse(struct ynl_parse_arg *yarg,
 			ynl_attr_for_each_nested(attr2, attr) {
 				if (ynl_attr_validate(yarg, attr2))
 					return YNL_PARSE_CB_ERROR;
-				dst->_count.act++;
+				n_act++;
 			}
 		} else if (type == TCA_FLOWER_KEY_ETH_DST) {
 			unsigned int len;
@@ -8984,7 +8984,7 @@ int tc_fw_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested)
 			ynl_attr_for_each_nested(attr2, attr) {
 				if (ynl_attr_validate(yarg, attr2))
 					return YNL_PARSE_CB_ERROR;
-				dst->_count.act++;
+				n_act++;
 			}
 		} else if (type == TCA_FW_MASK) {
 			if (ynl_attr_validate(yarg, attr))
@@ -9069,7 +9069,7 @@ int tc_matchall_attrs_parse(struct ynl_parse_arg *yarg,
 			ynl_attr_for_each_nested(attr2, attr) {
 				if (ynl_attr_validate(yarg, attr2))
 					return YNL_PARSE_CB_ERROR;
-				dst->_count.act++;
+				n_act++;
 			}
 		} else if (type == TCA_MATCHALL_FLAGS) {
 			if (ynl_attr_validate(yarg, attr))
@@ -9195,7 +9195,7 @@ int tc_route_attrs_parse(struct ynl_parse_arg *yarg,
 			ynl_attr_for_each_nested(attr2, attr) {
 				if (ynl_attr_validate(yarg, attr2))
 					return YNL_PARSE_CB_ERROR;
-				dst->_count.act++;
+				n_act++;
 			}
 		}
 	}
@@ -9329,7 +9329,7 @@ int tc_u32_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested)
 			ynl_attr_for_each_nested(attr2, attr) {
 				if (ynl_attr_validate(yarg, attr2))
 					return YNL_PARSE_CB_ERROR;
-				dst->_count.act++;
+				n_act++;
 			}
 		} else if (type == TCA_U32_INDEV) {
 			unsigned int len;