changed names for location mechanism