Some class names' corrections.