refactorings and renamings