Unique name needs to be truncated in get_class as well
Merge branch 'fireteam' into gb_master