Updated class names