Displaying squad names on the Available Units tab

[Creeperman]

Is there any way to force the display of a unit's squad name (as defined in the entity) on the Available Units tab instead of the unit's individual name? About all I can come up with is to change the unit names to match the squad names, then write an EntityDone script to change the unit names back again. Unfortunately, this method is less than reliable when dealing with user-specified names, and falls apart completely within the roster summary and model list outputs.