Refactor package names.