rename classes to sensible names
more