Fix syntax and variables names