Updating some class names.