Fun: refactor some method names