rename LocationsList clas
merge