Minor fixes to class names