[release-0.19] Cleanup duplicate code in curated packages and rename function

[release-0.19] Cleanup duplicate code in curated packages and rename function #20848