Rename storage stuff