refactoring duplicated names