diff --git a/home/nipa/nipa_out/984621/ynl/old-code/devlink-user.c b/home/nipa/nipa_out/984621/ynl/new-code/devlink-user.c
index 2bd563f9fa1b..d8c4dfddfb35 100644
--- a/home/nipa/nipa_out/984621/ynl/old-code/devlink-user.c
+++ b/home/nipa/nipa_out/984621/ynl/new-code/devlink-user.c
@@ -556,13 +556,13 @@ const struct ynl_policy_nest devlink_dl_selftest_id_nest = {
 	.table = devlink_dl_selftest_id_policy,
 };
 
-const struct ynl_policy_attr devlink_dl_rate_tc_bws_policy[DEVLINK_ATTR_MAX + 1] = {
-	[DEVLINK_ATTR_RATE_TC_INDEX] = { .name = "rate-tc-index", .type = YNL_PT_U8, },
-	[DEVLINK_ATTR_RATE_TC_BW] = { .name = "rate-tc-bw", .type = YNL_PT_U32, },
+const struct ynl_policy_attr devlink_dl_rate_tc_bws_policy[DEVLINK_RATE_TC_ATTR_MAX + 1] = {
+	[DEVLINK_RATE_TC_ATTR_INDEX] = { .name = "index", .type = YNL_PT_U8, },
+	[DEVLINK_RATE_TC_ATTR_BW] = { .name = "bw", .type = YNL_PT_U32, },
 };
 
 const struct ynl_policy_nest devlink_dl_rate_tc_bws_nest = {
-	.max_attr = DEVLINK_ATTR_MAX,
+	.max_attr = DEVLINK_RATE_TC_ATTR_MAX,
 	.table = devlink_dl_rate_tc_bws_policy,
 };
 
@@ -909,8 +909,6 @@ const struct ynl_policy_attr devlink_policy[DEVLINK_ATTR_MAX + 1] = {
 	[DEVLINK_ATTR_RATE_TX_WEIGHT] = { .name = "rate-tx-weight", .type = YNL_PT_U32, },
 	[DEVLINK_ATTR_REGION_DIRECT] = { .name = "region-direct", .type = YNL_PT_FLAG, },
 	[DEVLINK_ATTR_RATE_TC_BWS] = { .name = "rate-tc-bws", .type = YNL_PT_NEST, .nest = &devlink_dl_rate_tc_bws_nest, },
-	[DEVLINK_ATTR_RATE_TC_INDEX] = { .name = "rate-tc-index", .type = YNL_PT_U8, },
-	[DEVLINK_ATTR_RATE_TC_BW] = { .name = "rate-tc-bw", .type = YNL_PT_U32, },
 };
 
 const struct ynl_policy_nest devlink_nest = {
@@ -1536,10 +1534,10 @@ int devlink_dl_rate_tc_bws_put(struct nlmsghdr *nlh, unsigned int attr_type,
 	struct nlattr *nest;
 
 	nest = ynl_attr_nest_start(nlh, attr_type);
-	if (obj->_present.rate_tc_index)
-		ynl_attr_put_u8(nlh, DEVLINK_ATTR_RATE_TC_INDEX, obj->rate_tc_index);
-	if (obj->_present.rate_tc_bw)
-		ynl_attr_put_u32(nlh, DEVLINK_ATTR_RATE_TC_BW, obj->rate_tc_bw);
+	if (obj->_present.index)
+		ynl_attr_put_u8(nlh, DEVLINK_RATE_TC_ATTR_INDEX, obj->index);
+	if (obj->_present.bw)
+		ynl_attr_put_u32(nlh, DEVLINK_RATE_TC_ATTR_BW, obj->bw);
 	ynl_attr_nest_end(nlh, nest);
 
 	return 0;
diff --git a/home/nipa/nipa_out/984621/ynl/old-code/devlink-user.h b/home/nipa/nipa_out/984621/ynl/new-code/devlink-user.h
index fc02563586d9..48bc856df8e4 100644
--- a/home/nipa/nipa_out/984621/ynl/old-code/devlink-user.h
+++ b/home/nipa/nipa_out/984621/ynl/new-code/devlink-user.h
@@ -311,12 +311,12 @@ struct devlink_dl_selftest_id {
 
 struct devlink_dl_rate_tc_bws {
 	struct {
-		__u32 rate_tc_index:1;
-		__u32 rate_tc_bw:1;
+		__u32 index:1;
+		__u32 bw:1;
 	} _present;
 
-	__u8 rate_tc_index;
-	__u32 rate_tc_bw;
+	__u8 index;
+	__u32 bw;
 };
 
 void devlink_dl_rate_tc_bws_free(struct devlink_dl_rate_tc_bws *obj);