ENH: Add new names/folder handling + COMP: fix BatchMake compilation