Slight adjustment to class names