Rename storage classes.