Rename: Adapter -> Storage