Rename storage classes