refactor namefix to match paper;