Refactor pkg names