generalise usearch path, fix renaming