refactoring after name changes