Refactoring: changed some method names.