Renamed the classes.