refactoring: rename some methods and properties