Updated names in findNeighbours