Eliminate "2" suffix on all new refactor effort classes.