refactor name package