Correct names following bad refactoring