Replace shape with geometry (rebased)

leave old names as 'deprecated'