Updated class names and references