rename classes more consistently