small naming refactorings