Better names, catch bug from refactoring.