Oops forgot some renamings in the previous refactoring