class name fixes