Refactor package names