some more name/syntax fixes