Updated class names.