Replace shape with geometry (rebased)

leave old props as 'deprecated' methods