Fix two typos in variable and macro names