naming and syntax fixes