Renamed various classes.