fix a few minor issues with class names