Replace shape with geometry (rebased)

should be use_collision_geometry