lots more small name changes in the parser, preparing for function parsing
function parsing!