Changed names of classes.