class name tweaks