Renamed some classes.