fix syntax and naming issues