Refactor the package names