Follow-up to #9897: Rename some internal variable and function names