[TASK] Refactoring PackageName -> PackageKey