rename parse tree class names and minor fixes