#19713 Fix inconsitency with variable names