Small name refactorings