Minor naming refactoring