Fix variable names