Done changes according to rename of classes.