Refactor package name