Replace shape with geometry (rebased)

again, you should leave the old function name with a 'deprecated' error.