refactor namefix to match paper, again