Closes #20926 BREAKING CHANGE: matchPackageNames now matches both depName (existing) and packageName (new)