naming and syntax correction