Revert "Tweak names of 2 instrinsics, which were recently changed"

[searlmc1]

This reverts commit 2fa7991f056a05fb0404f17dd866046f169ba3f4. The intrinsic name change went into an internal branch; therefore, this change is not necessary (and, if it is, then it should be changed elsewhere and then merged; not pushed directly).