Made changes to class names.