Refactor name package calculator .