I agree regarding renaming - I updated this for usearch61 and added #857 for the others.