diff --git a/home/nipa/nipa_out/975469/ynl/old-code/devlink-user.c b/home/nipa/nipa_out/975469/ynl/new-code/devlink-user.c
index 59d5ec238155..6fccc3729ce0 100644
--- a/home/nipa/nipa_out/975469/ynl/old-code/devlink-user.c
+++ b/home/nipa/nipa_out/975469/ynl/new-code/devlink-user.c
@@ -79,11 +79,11 @@ static const char * const devlink_port_flavour_strmap[] = {
 	[0] = "physical",
 	[1] = "cpu",
 	[2] = "dsa",
-	[3] = "pci_pf",
-	[4] = "pci_vf",
+	[3] = "pci-pf",
+	[4] = "pci-vf",
 	[5] = "virtual",
 	[6] = "unused",
-	[7] = "pci_sf",
+	[7] = "pci-sf",
 };
 
 const char *devlink_port_flavour_str(enum devlink_port_flavour value)
@@ -324,7 +324,7 @@ static const char * const devlink_var_attr_type_strmap[] = {
 	[4] = "u64",
 	[5] = "string",
 	[6] = "flag",
-	[10] = "nul_string",
+	[10] = "nul-string",
 	[11] = "binary",
 };
 
diff --git a/home/nipa/nipa_out/975469/ynl/old-code/ethtool-user.c b/home/nipa/nipa_out/975469/ynl/new-code/ethtool-user.c
index 2b0512ff1fac..f130f6ffbdf3 100644
--- a/home/nipa/nipa_out/975469/ynl/old-code/ethtool-user.c
+++ b/home/nipa/nipa_out/975469/ynl/new-code/ethtool-user.c
@@ -112,7 +112,7 @@ const char *ethtool_header_flags_str(enum ethtool_header_flags value)
 
 static const char * const ethtool_module_fw_flash_status_strmap[] = {
 	[0] = "started",
-	[1] = "in_progress",
+	[1] = "in-progress",
 	[2] = "completed",
 	[3] = "error",
 };
@@ -835,7 +835,7 @@ const struct ynl_policy_attr ethtool_rss_policy[ETHTOOL_A_RSS_MAX + 1] = {
 	[ETHTOOL_A_RSS_HFUNC] = { .name = "hfunc", .type = YNL_PT_U32, },
 	[ETHTOOL_A_RSS_INDIR] = { .name = "indir", .type = YNL_PT_BINARY,},
 	[ETHTOOL_A_RSS_HKEY] = { .name = "hkey", .type = YNL_PT_BINARY,},
-	[ETHTOOL_A_RSS_INPUT_XFRM] = { .name = "input_xfrm", .type = YNL_PT_U32, },
+	[ETHTOOL_A_RSS_INPUT_XFRM] = { .name = "input-xfrm", .type = YNL_PT_U32, },
 	[ETHTOOL_A_RSS_START_CONTEXT] = { .name = "start-context", .type = YNL_PT_U32, },
 };
 
diff --git a/home/nipa/nipa_out/975469/ynl/old-code/fou-user.c b/home/nipa/nipa_out/975469/ynl/new-code/fou-user.c
index c15d1f15813a..af194dc8fac3 100644
--- a/home/nipa/nipa_out/975469/ynl/old-code/fou-user.c
+++ b/home/nipa/nipa_out/975469/ynl/new-code/fou-user.c
@@ -45,12 +45,12 @@ const struct ynl_policy_attr fou_policy[FOU_ATTR_MAX + 1] = {
 	[FOU_ATTR_AF] = { .name = "af", .type = YNL_PT_U8, },
 	[FOU_ATTR_IPPROTO] = { .name = "ipproto", .type = YNL_PT_U8, },
 	[FOU_ATTR_TYPE] = { .name = "type", .type = YNL_PT_U8, },
-	[FOU_ATTR_REMCSUM_NOPARTIAL] = { .name = "remcsum_nopartial", .type = YNL_PT_FLAG, },
-	[FOU_ATTR_LOCAL_V4] = { .name = "local_v4", .type = YNL_PT_U32, },
-	[FOU_ATTR_LOCAL_V6] = { .name = "local_v6", .type = YNL_PT_BINARY,},
-	[FOU_ATTR_PEER_V4] = { .name = "peer_v4", .type = YNL_PT_U32, },
-	[FOU_ATTR_PEER_V6] = { .name = "peer_v6", .type = YNL_PT_BINARY,},
-	[FOU_ATTR_PEER_PORT] = { .name = "peer_port", .type = YNL_PT_U16, },
+	[FOU_ATTR_REMCSUM_NOPARTIAL] = { .name = "remcsum-nopartial", .type = YNL_PT_FLAG, },
+	[FOU_ATTR_LOCAL_V4] = { .name = "local-v4", .type = YNL_PT_U32, },
+	[FOU_ATTR_LOCAL_V6] = { .name = "local-v6", .type = YNL_PT_BINARY,},
+	[FOU_ATTR_PEER_V4] = { .name = "peer-v4", .type = YNL_PT_U32, },
+	[FOU_ATTR_PEER_V6] = { .name = "peer-v6", .type = YNL_PT_BINARY,},
+	[FOU_ATTR_PEER_PORT] = { .name = "peer-port", .type = YNL_PT_U16, },
 	[FOU_ATTR_IFINDEX] = { .name = "ifindex", .type = YNL_PT_U32, },
 };
 
diff --git a/home/nipa/nipa_out/975469/ynl/old-code/nfsd-user.c b/home/nipa/nipa_out/975469/ynl/new-code/nfsd-user.c
index 5da18ebdd245..74c6a9cb2bfe 100644
--- a/home/nipa/nipa_out/975469/ynl/old-code/nfsd-user.c
+++ b/home/nipa/nipa_out/975469/ynl/new-code/nfsd-user.c
@@ -59,7 +59,7 @@ const struct ynl_policy_attr nfsd_rpc_status_policy[NFSD_A_RPC_STATUS_MAX + 1] =
 	[NFSD_A_RPC_STATUS_PROG] = { .name = "prog", .type = YNL_PT_U32, },
 	[NFSD_A_RPC_STATUS_VERSION] = { .name = "version", .type = YNL_PT_U8, },
 	[NFSD_A_RPC_STATUS_PROC] = { .name = "proc", .type = YNL_PT_U32, },
-	[NFSD_A_RPC_STATUS_SERVICE_TIME] = { .name = "service_time", .type = YNL_PT_U64, },
+	[NFSD_A_RPC_STATUS_SERVICE_TIME] = { .name = "service-time", .type = YNL_PT_U64, },
 	[NFSD_A_RPC_STATUS_PAD] = { .name = "pad", .type = YNL_PT_IGNORE, },
 	[NFSD_A_RPC_STATUS_SADDR4] = { .name = "saddr4", .type = YNL_PT_U32, },
 	[NFSD_A_RPC_STATUS_DADDR4] = { .name = "daddr4", .type = YNL_PT_U32, },