Fix variable name references