Renamed buffer classes.