Some renaming; beginning on hashed knn lookup.