Make gennames match make_unique naming convention