Names refactor