Name and method refactor.