Rename adapter to storage and base