Fix syntax, naming