Minor naming refactorings