small renamings + refactorings