renaming and refactoring