Fixes in generated expand_cluster_name and raid_group