Replace shape with geometry (rebased)

old names as deprecated