refactoring: methods and parameters names changed