Merge "Revert "[satellite] Removed hardcoded package name"" into main