Fixed class names.