Rename classes to be more consistent