some class name tweaks