Fair enough.
Ironically, that naming scheme is one of those rare moments where both Disney and Legends content agrees. I do hope you at least retain the few things Disney decided to add unaltered from the old Expanded Universe such as those created during the Republic Commando and Open Seasons era as I consider those the strongest times for Mandalorian content.