Changed names of locations