REFACTORING: just renamings