minor changes to class names.