Some renamings

TPASortByHeatmap => TPASortByHeat
TPASortByNearbyPoints(2) => TPASortByNeighbours(2)