Fix variable names. #2757