Minor renaming to add more consistency across instrumentations.