Replace shape with geometry (rebased)

old name as 'deprecated'