Rename some raw parse tree struct fields