Changed naming of classes.