[REFACTORING] Rename methods