Renamed data classes.