refactoring after rename