refactoring, renaming members