Renamed maker classes.