rename nodes to better reflect the grammar and what they represent