Names refactoring