Refactor name package.