Fix syntax, variable names