Replace shape with geometry (rebased)

These will be handled by adding the old-names as deprecated in RigidBodyTerrain