Refactor the bases.
Rename 'bases' to 'shape'.