Replace shape with geometry (rebased)

leave old name as 'deprecated'