Name these classes more consistently