Refactoring - rename methods