Need to update a few references - quite straightforward, but should be backported. <!-- gh-linked-prs --> ### Linked PRs * gh-115544 * gh-115689 * gh-115690 <!-- /gh-linked-prs -->