general cleanup
Change a few class names for consistency