Rename @xpath to something more meaningful